Merge branch 'master' into non-neg-deriv

.clang-tidy

@@ -1,170 +1,137 @@
-Checks: '-*,
+# Enable all checks + disale selected checks. Feel free to remove disabled checks from below list if
-    misc-throw-by-value-catch-by-reference,
+# a) the new check is not controversial (this includes many checks in readability-* and google-*) or
-    misc-misplaced-const,
+# b) too noisy (checks with > 100 new warnings are considered noisy, this includes e.g. cppcoreguidelines-*).
-    misc-unconventional-assign-operator,
+Checks: '*,
-    misc-redundant-expression,
+    -abseil-*,
-    misc-static-assert,
-    misc-unconventional-assign-operator,
-    misc-uniqueptr-reset-release,
-    misc-unused-alias-decls,
-    misc-unused-parameters,
-    misc-unused-using-decls,
 
-    modernize-avoid-bind,
+    -altera-*,
-    modernize-loop-convert,
-    modernize-make-shared,
-    modernize-make-unique,
-    modernize-raw-string-literal,
-    modernize-redundant-void-arg,
-    modernize-replace-auto-ptr,
-    modernize-replace-random-shuffle,
-    modernize-use-bool-literals,
-    modernize-use-nullptr,
-    modernize-use-using,
-    modernize-use-equals-default,
-    modernize-use-equals-delete,
 
-    performance-faster-string-find,
+    -android-*,
-    performance-for-range-copy,
-    performance-implicit-conversion-in-loop,
-    performance-inefficient-algorithm,
-    performance-inefficient-vector-operation,
-    performance-move-constructor-init,
-    performance-no-automatic-move,
-    performance-trivially-destructible,
-    performance-unnecessary-copy-initialization,
-    performance-noexcept-move-constructor,
-    performance-move-const-arg,
 
-    readability-avoid-const-params-in-decls,
+    -bugprone-branch-clone,
-    readability-const-return-type,
+    -bugprone-easily-swappable-parameters,
-    readability-container-size-empty,
+    -bugprone-exception-escape,
-    readability-convert-member-functions-to-static,
+    -bugprone-implicit-widening-of-multiplication-result,
-    readability-delete-null-pointer,
+    -bugprone-narrowing-conversions,
-    readability-deleted-default,
+    -bugprone-not-null-terminated-result,
-    readability-make-member-function-const,
-    readability-misplaced-array-index,
-    readability-non-const-parameter,
-    readability-qualified-auto,
-    readability-redundant-access-specifiers,
-    readability-redundant-control-flow,
-    readability-redundant-function-ptr-dereference,
-    readability-redundant-smartptr-get,
-    readability-redundant-string-cstr,
-    readability-redundant-string-init,
-    readability-static-definition-in-anonymous-namespace,
-    readability-string-compare,
-    readability-uniqueptr-delete-release,
-    readability-redundant-member-init,
-    readability-simplify-subscript-expr,
-    readability-simplify-boolean-expr,
-    readability-inconsistent-declaration-parameter-name,
-    readability-identifier-naming,
 
-    bugprone-undelegated-constructor,
+    -cert-dcl16-c,
-    bugprone-argument-comment,
+    -cert-err58-cpp,
-    bugprone-bad-signal-to-kill-thread,
+    -cert-msc32-c,
-    bugprone-bool-pointer-implicit-conversion,
+    -cert-msc51-cpp,
-    bugprone-copy-constructor-init,
+    -cert-oop54-cpp,
-    bugprone-dangling-handle,
+    -cert-oop57-cpp,
-    bugprone-forward-declaration-namespace,
-    bugprone-fold-init-type,
-    bugprone-inaccurate-erase,
-    bugprone-incorrect-roundings,
-    bugprone-infinite-loop,
-    bugprone-integer-division,
-    bugprone-macro-parentheses,
-    bugprone-macro-repeated-side-effects,
-    bugprone-misplaced-operator-in-strlen-in-alloc,
-    bugprone-misplaced-pointer-artithmetic-in-alloc,
-    bugprone-misplaced-widening-cast,
-    bugprone-move-forwarding-reference,
-    bugprone-multiple-statement-macro,
-    bugprone-parent-virtual-call,
-    bugprone-posix-return,
-    bugprone-reserved-identifier,
-    bugprone-signed-char-misuse,
-    bugprone-sizeof-container,
-    bugprone-sizeof-expression,
-    bugprone-string-constructor,
-    bugprone-string-integer-assignment,
-    bugprone-string-literal-with-embedded-nul,
-    bugprone-suspicious-enum-usage,
-    bugprone-suspicious-include,
-    bugprone-suspicious-memset-usage,
-    bugprone-suspicious-missing-comma,
-    bugprone-suspicious-string-compare,
-    bugprone-swapped-arguments,
-    bugprone-terminating-continue,
-    bugprone-throw-keyword-missing,
-    bugprone-too-small-loop-variable,
-    bugprone-undefined-memory-manipulation,
-    bugprone-unhandled-self-assignment,
-    bugprone-unused-raii,
-    bugprone-unused-return-value,
-    bugprone-use-after-move,
-    bugprone-virtual-near-miss,
 
-    cert-dcl21-cpp,
+    -clang-analyzer-optin.performance.Padding,
-    cert-dcl50-cpp,
+    -clang-analyzer-optin.portability.UnixAPI,
-    cert-env33-c,
-    cert-err34-c,
-    cert-err52-cpp,
-    cert-flp30-c,
-    cert-mem57-cpp,
-    cert-msc50-cpp,
-    cert-oop58-cpp,
 
-    google-build-explicit-make-pair,
+    -clang-analyzer-security.insecureAPI.bzero,
-    google-build-namespaces,
+    -clang-analyzer-security.insecureAPI.strcpy,
-    google-default-arguments,
-    google-explicit-constructor,
-    google-readability-casting,
-    google-readability-avoid-underscore-in-googletest-name,
-    google-runtime-int,
-    google-runtime-operator,
 
-    hicpp-exception-baseclass,
+    -cppcoreguidelines-avoid-c-arrays,
+    -cppcoreguidelines-avoid-goto,
+    -cppcoreguidelines-avoid-magic-numbers,
+    -cppcoreguidelines-avoid-non-const-global-variables,
+    -cppcoreguidelines-explicit-virtual-functions,
+    -cppcoreguidelines-init-variables,
+    -cppcoreguidelines-interfaces-global-init,
+    -cppcoreguidelines-macro-usage,
+    -cppcoreguidelines-narrowing-conversions,
+    -cppcoreguidelines-no-malloc,
+    -cppcoreguidelines-non-private-member-variables-in-classes,
+    -cppcoreguidelines-owning-memory,
+    -cppcoreguidelines-prefer-member-initializer,
+    -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
+    -cppcoreguidelines-pro-bounds-constant-array-index,
+    -cppcoreguidelines-pro-bounds-pointer-arithmetic,
+    -cppcoreguidelines-pro-type-const-cast,
+    -cppcoreguidelines-pro-type-cstyle-cast,
+    -cppcoreguidelines-pro-type-member-init,
+    -cppcoreguidelines-pro-type-reinterpret-cast,
+    -cppcoreguidelines-pro-type-static-cast-downcast,
+    -cppcoreguidelines-pro-type-union-access,
+    -cppcoreguidelines-pro-type-vararg,
+    -cppcoreguidelines-slicing,
+    -cppcoreguidelines-special-member-functions,
 
-    clang-analyzer-core.CallAndMessage,
+    -concurrency-mt-unsafe,
-    clang-analyzer-core.DivideZero,
-    clang-analyzer-core.NonNullParamChecker,
-    clang-analyzer-core.NullDereference,
-    clang-analyzer-core.StackAddressEscape,
-    clang-analyzer-core.UndefinedBinaryOperatorResult,
-    clang-analyzer-core.VLASize,
-    clang-analyzer-core.uninitialized.ArraySubscript,
-    clang-analyzer-core.uninitialized.Assign,
-    clang-analyzer-core.uninitialized.Branch,
-    clang-analyzer-core.uninitialized.CapturedBlockVariable,
-    clang-analyzer-core.uninitialized.UndefReturn,
-    clang-analyzer-cplusplus.InnerPointer,
-    clang-analyzer-cplusplus.NewDelete,
-    clang-analyzer-cplusplus.NewDeleteLeaks,
-    clang-analyzer-cplusplus.PlacementNewChecker,
-    clang-analyzer-cplusplus.SelfAssignment,
-    clang-analyzer-deadcode.DeadStores,
-    clang-analyzer-cplusplus.Move,
-    clang-analyzer-optin.cplusplus.VirtualCall,
-    clang-analyzer-security.insecureAPI.UncheckedReturn,
-    clang-analyzer-security.insecureAPI.bcmp,
-    clang-analyzer-security.insecureAPI.bcopy,
-    clang-analyzer-security.insecureAPI.bzero,
-    clang-analyzer-security.insecureAPI.getpw,
-    clang-analyzer-security.insecureAPI.gets,
-    clang-analyzer-security.insecureAPI.mkstemp,
-    clang-analyzer-security.insecureAPI.mktemp,
-    clang-analyzer-security.insecureAPI.rand,
-    clang-analyzer-security.insecureAPI.strcpy,
-    clang-analyzer-unix.Malloc,
-    clang-analyzer-unix.MallocSizeof,
-    clang-analyzer-unix.MismatchedDeallocator,
-    clang-analyzer-unix.Vfork,
-    clang-analyzer-unix.cstring.BadSizeArg,
-    clang-analyzer-unix.cstring.NullArg,
 
-    boost-use-to-string,
+    -darwin-*,
+
+    -fuchsia-*,
+
+    -google-build-using-namespace,
+    -google-readability-braces-around-statements,
+    -google-readability-function-size,
+    -google-readability-namespace-comments,
+    -google-readability-todo,
+    -google-upgrade-googletest-case,
+
+    -hicpp-avoid-c-arrays,
+    -hicpp-avoid-goto,
+    -hicpp-braces-around-statements,
+    -hicpp-explicit-conversions,
+    -hicpp-function-size,
+    -hicpp-member-init,
+    -hicpp-move-const-arg,
+    -hicpp-multiway-paths-covered,
+    -hicpp-named-parameter,
+    -hicpp-no-array-decay,
+    -hicpp-no-assembler,
+    -hicpp-no-malloc,
+    -hicpp-signed-bitwise,
+    -hicpp-special-member-functions,
+    -hicpp-uppercase-literal-suffix,
+    -hicpp-use-auto,
+    -hicpp-use-emplace,
+    -hicpp-vararg,
+
+    -linuxkernel-*,
+
+    -llvm-*,
+
+    -llvmlibc-*,
+
+    -openmp-*,
+
+    -misc-no-recursion,
+    -misc-non-private-member-variables-in-classes,
+
+    -modernize-avoid-c-arrays,
+    -modernize-concat-nested-namespaces,
+    -modernize-pass-by-value,
+    -modernize-return-braced-init-list,
+    -modernize-use-auto,
+    -modernize-use-default-member-init,
+    -modernize-use-emplace,
+    -modernize-use-nodiscard,
+    -modernize-use-override,
+    -modernize-use-trailing-return-type,
+
+    -performance-inefficient-string-concatenation,
+    -performance-no-int-to-ptr,
+    -performance-unnecessary-value-param,
+
+    -portability-simd-intrinsics,
+
+    -readability-braces-around-statements,
+    -readability-else-after-return,
+    -readability-function-cognitive-complexity,
+    -readability-function-size,
+    -readability-identifier-length,
+    -readability-implicit-bool-conversion,
+    -readability-isolate-declaration,
+    -readability-magic-numbers,
+    -readability-named-parameter,
+    -readability-redundant-declaration,
+    -readability-static-accessed-through-instance,
+    -readability-suspicious-call-argument,
+    -readability-uppercase-literal-suffix,
+    -readability-use-anyofallof,
+
+    -zirkon-*,
 '
+
 WarningsAsErrors: '*'
 
 CheckOptions:
@@ -210,3 +177,6 @@ CheckOptions:
     value: false
   - key: performance-move-const-arg.CheckTriviallyCopyableMove
     value: false
+    # Workaround clang-tidy bug: https://github.com/llvm/llvm-project/issues/46097
+  - key: readability-identifier-naming.TypeTemplateParameterIgnoredRegexp
+    value: expr-type

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,13 @@
-Changelog category (leave one):
+<!---
+A technical comment, you are free to remove or leave it as it is when PR is created
+The following categories are used in the next scripts, update them accordingly
+utils/changelog/changelog.py
+tests/ci/run_check.py
+-->
+### Changelog category (leave one):
 - New Feature
 - Improvement
-- Bug Fix (user-visible misbehaviour in official stable or prestable release)
+- Bug Fix (user-visible misbehavior in official stable or prestable release)
 - Performance Improvement
 - Backward Incompatible Change
 - Build/Testing/Packaging Improvement
@@ -9,8 +15,8 @@ Changelog category (leave one):
 - Not for changelog (changelog entry is not required)
 
 
-Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
+### Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
 ...
 
 
-> Information about CI checks: https://clickhouse.tech/docs/en/development/continuous-integration/
+> Information about CI checks: https://clickhouse.com/docs/en/development/continuous-integration/

.github/workflows/backport.yml

@@ -38,6 +38,8 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"

.github/workflows/backport_branches.yml

@@ -9,6 +9,18 @@ on: # yamllint disable-line rule:truthy
     branches:
       - 'backport/**'
 jobs:
+  PythonUnitTests:
+    runs-on: [self-hosted, style-checker]
+    steps:
+      - name: Clear repository
+        run: |
+          sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - name: Python unit tests
+        run: |
+          cd "$GITHUB_WORKSPACE/tests/ci"
+          python3 -m unittest discover -s . -p '*_test.py'
   DockerHubPushAarch64:
     runs-on: [self-hosted, style-checker-aarch64]
     steps:
@@ -100,8 +112,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
 #########################################################################################
 #################################### ORDINARY BUILDS ####################################
@@ -117,7 +131,6 @@ jobs:
           IMAGES_PATH=${{runner.temp}}/images_path
           REPO_COPY=${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH=${{runner.temp}}/../ccaches
-          CHECK_NAME=ClickHouse build check (actions)
           BUILD_NAME=package_release
           EOF
       - name: Download changed images
@@ -130,26 +143,27 @@ jobs:
           sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
       - name: Check out repository code
         uses: actions/checkout@v2
-        with:
-          submodules: 'true'
-          fetch-depth: 0 # otherwise we will have no info about contributors
       - name: Build
         run: |
+          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
       - name: Upload build URLs to artifacts
         if: ${{ success() || failure() }}
         uses: actions/upload-artifact@v2
         with:
-          name: ${{ env.BUILD_NAME }}
+          name: ${{ env.BUILD_URLS }}
-          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_NAME }}.json
+          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_URLS }}.json
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
   BuilderDebAarch64:
     needs: [DockerHubPush]
@@ -162,35 +176,39 @@ jobs:
           IMAGES_PATH=${{runner.temp}}/images_path
           REPO_COPY=${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH=${{runner.temp}}/../ccaches
-          CHECK_NAME=ClickHouse build check (actions)
           BUILD_NAME=package_aarch64
           EOF
       - name: Download changed images
         uses: actions/download-artifact@v2
         with:
           name: changed_images
-          path: ${{ runner.temp }}/images_path
+          path: ${{ env.IMAGES_PATH }}
+      - name: Clear repository
+        run: |
+          sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
       - name: Check out repository code
         uses: actions/checkout@v2
-        with:
-          submodules: 'true'
-          fetch-depth: 0 # otherwise we will have no info about contributors
       - name: Build
         run: |
+          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
       - name: Upload build URLs to artifacts
+        if: ${{ success() || failure() }}
         uses: actions/upload-artifact@v2
         with:
-          name: ${{ env.BUILD_NAME }}
+          name: ${{ env.BUILD_URLS }}
-          path: ${{ runner.temp }}/build_check/${{ env.BUILD_NAME }}.json
+          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_URLS }}.json
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
   BuilderDebAsan:
     needs: [DockerHubPush]
@@ -203,7 +221,6 @@ jobs:
           IMAGES_PATH=${{runner.temp}}/images_path
           REPO_COPY=${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH=${{runner.temp}}/../ccaches
-          CHECK_NAME=ClickHouse build check (actions)
           BUILD_NAME=package_asan
           EOF
       - name: Download changed images
@@ -216,26 +233,27 @@ jobs:
           sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
       - name: Check out repository code
         uses: actions/checkout@v2
-        with:
-          submodules: 'true'
-          fetch-depth: 0 # otherwise we will have no info about contributors
       - name: Build
         run: |
+          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
       - name: Upload build URLs to artifacts
         if: ${{ success() || failure() }}
         uses: actions/upload-artifact@v2
         with:
-          name: ${{ env.BUILD_NAME }}
+          name: ${{ env.BUILD_URLS }}
-          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_NAME }}.json
+          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_URLS }}.json
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
   BuilderDebTsan:
     needs: [DockerHubPush]
@@ -248,7 +266,6 @@ jobs:
           IMAGES_PATH=${{runner.temp}}/images_path
           REPO_COPY=${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH=${{runner.temp}}/../ccaches
-          CHECK_NAME=ClickHouse build check (actions)
           BUILD_NAME=package_tsan
           EOF
       - name: Download changed images
@@ -261,26 +278,27 @@ jobs:
           sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
       - name: Check out repository code
         uses: actions/checkout@v2
-        with:
-          submodules: 'true'
-          fetch-depth: 0 # otherwise we will have no info about contributors
       - name: Build
         run: |
+          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
       - name: Upload build URLs to artifacts
         if: ${{ success() || failure() }}
         uses: actions/upload-artifact@v2
         with:
-          name: ${{ env.BUILD_NAME }}
+          name: ${{ env.BUILD_URLS }}
-          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_NAME }}.json
+          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_URLS }}.json
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
   BuilderDebDebug:
     needs: [DockerHubPush]
@@ -293,7 +311,6 @@ jobs:
           IMAGES_PATH=${{runner.temp}}/images_path
           REPO_COPY=${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH=${{runner.temp}}/../ccaches
-          CHECK_NAME=ClickHouse build check (actions)
           BUILD_NAME=package_debug
           EOF
       - name: Download changed images
@@ -306,26 +323,27 @@ jobs:
           sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
       - name: Check out repository code
         uses: actions/checkout@v2
-        with:
-          submodules: 'true'
-          fetch-depth: 0 # otherwise we will have no info about contributors
       - name: Build
         run: |
+          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
       - name: Upload build URLs to artifacts
         if: ${{ success() || failure() }}
         uses: actions/upload-artifact@v2
         with:
-          name: ${{ env.BUILD_NAME }}
+          name: ${{ env.BUILD_URLS }}
-          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_NAME }}.json
+          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_URLS }}.json
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
 ############################################################################################
 ##################################### BUILD REPORTER #######################################
@@ -342,9 +360,10 @@ jobs:
       - name: Set envs
         run: |
           cat >> "$GITHUB_ENV" << 'EOF'
-          TEMP_PATH=${{runner.temp}}/report_check
-          REPORTS_PATH=${{runner.temp}}/reports_dir
           CHECK_NAME=ClickHouse build check (actions)
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          TEMP_PATH=${{runner.temp}}/report_check
+          NEEDS_DATA_PATH=${{runner.temp}}/needs.json
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -359,13 +378,18 @@ jobs:
         run: |
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
+          cat > "$NEEDS_DATA_PATH" << 'EOF'
+          ${{ toJSON(needs) }}
+          EOF
           cd "$GITHUB_WORKSPACE/tests/ci"
           python3 build_report_check.py "$CHECK_NAME"
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
 ##############################################################################################
 ########################### FUNCTIONAl STATELESS TESTS #######################################
@@ -402,8 +426,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
 ##############################################################################################
 ############################ FUNCTIONAl STATEFUL TESTS #######################################
@@ -440,8 +466,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
 ##############################################################################################
 ######################################### STRESS TESTS #######################################
@@ -481,8 +509,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
 #############################################################################################
 ############################# INTEGRATION TESTS #############################################
@@ -518,8 +548,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   FinishCheck:
     needs:

.github/workflows/debug.yml

@@ -2,7 +2,7 @@
 name: Debug
 
 'on':
-  [push, pull_request, release]
+  [push, pull_request, release, workflow_dispatch]
 
 jobs:
   DebugInfo:

.github/workflows/docs_check.yml

@@ -4,7 +4,7 @@ env:
   # Force the stdout and stderr streams to be unbuffered
   PYTHONUNBUFFERED: 1
 
-on: # yamllint disable-line rule:truthy
+on:  # yamllint disable-line rule:truthy
   pull_request:
     types:
       - synchronize
@@ -13,6 +13,7 @@ on: # yamllint disable-line rule:truthy
     branches:
       - master
     paths:
+      - 'docker/docs/**'
       - 'docs/**'
       - 'website/**'
 jobs:
@@ -92,9 +93,43 @@ jobs:
         with:
           name: changed_images
           path: ${{ runner.temp }}/changed_images.json
+  StyleCheck:
+    needs: DockerHubPush
+    runs-on: [self-hosted, style-checker]
+    if: ${{ success() || failure() }}
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{ runner.temp }}/style_check
+          EOF
+      - name: Download changed images
+        # even if artifact does not exist, e.g. on `do not test` label or failed Docker job
+        continue-on-error: true
+        uses: actions/download-artifact@v2
+        with:
+          name: changed_images
+          path: ${{ env.TEMP_PATH }}
+      - name: Clear repository
+        run: |
+          sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - name: Style Check
+        run: |
+          cd "$GITHUB_WORKSPACE/tests/ci"
+          python3 style_check.py
+      - name: Cleanup
+        if: always()
+        run: |
+          # shellcheck disable=SC2046
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
+          sudo rm -fr "$TEMP_PATH"
   DocsCheck:
     needs: DockerHubPush
-    runs-on: [self-hosted, func-tester]
+    runs-on: [self-hosted, func-tester-aarch64]
     steps:
       - name: Set envs
         run: |
@@ -120,6 +155,24 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
+  FinishCheck:
+    needs:
+      - StyleCheck
+      - DockerHubPush
+      - DocsCheck
+    runs-on: [self-hosted, style-checker]
+    steps:
+      - name: Clear repository
+        run: |
+          sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - name: Finish label
+        run: |
+          cd "$GITHUB_WORKSPACE/tests/ci"
+          python3 finish_check.py

.github/workflows/docs_release.yml

@@ -7,16 +7,17 @@ env:
 concurrency:
   group: master-release
   cancel-in-progress: true
-on: # yamllint disable-line rule:truthy
+'on':
   push:
     branches:
       - master
     paths:
-      - 'docs/**'
-      - 'website/**'
-      - 'benchmark/**'
-      - 'docker/**'
       - '.github/**'
+      - 'benchmark/**'
+      - 'docker/docs/release/**'
+      - 'docs/**'
+      - 'utils/list-versions/version_date.tsv'
+      - 'website/**'
   workflow_dispatch:
 jobs:
   DockerHubPushAarch64:
@@ -116,6 +117,8 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"

.github/workflows/jepsen.yml

@@ -7,11 +7,8 @@ concurrency:
 on: # yamllint disable-line rule:truthy
   schedule:
     - cron: '0 */6 * * *'
-  workflow_run:
-    workflows: ["PullRequestCI"]
-    types:
-      - completed
   workflow_dispatch:
+  workflow_call:
 jobs:
   KeeperJepsenRelease:
     runs-on: [self-hosted, style-checker]
@@ -39,6 +36,8 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"

.github/workflows/nightly.yml

@@ -72,3 +72,54 @@ jobs:
         with:
           name: changed_images
           path: ${{ runner.temp }}/changed_images.json
+  BuilderCoverity:
+    needs: DockerHubPush
+    runs-on: [self-hosted, builder]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          BUILD_NAME=coverity
+          CACHES_PATH=${{runner.temp}}/../ccaches
+          CHECK_NAME=ClickHouse build check (actions)
+          IMAGES_PATH=${{runner.temp}}/images_path
+          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
+          TEMP_PATH=${{runner.temp}}/build_check
+          EOF
+          echo "COVERITY_TOKEN=${{ secrets.COVERITY_TOKEN }}" >> "$GITHUB_ENV"
+      - name: Download changed images
+        uses: actions/download-artifact@v2
+        with:
+          name: changed_images
+          path: ${{ env.IMAGES_PATH }}
+      - name: Clear repository
+        run: |
+          sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
+      - name: Check out repository code
+        id: coverity-checkout
+        uses: actions/checkout@v2
+        with:
+          submodules: 'true'
+      - name: Build
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+      - name: Upload Coverity Analysis
+        if: ${{ success() || failure() }}
+        run: |
+          curl --form token="${COVERITY_TOKEN}" \
+            --form email='security+coverity@clickhouse.com' \
+            --form file="@$TEMP_PATH/$BUILD_NAME/coverity-scan.tgz" \
+            --form version="${GITHUB_REF#refs/heads/}-${GITHUB_SHA::6}" \
+            --form description="Nighly Scan: $(date +'%Y-%m-%dT%H:%M:%S')" \
+            https://scan.coverity.com/builds?project=ClickHouse%2FClickHouse
+      - name: Cleanup
+        if: always()
+        run: |
+          # shellcheck disable=SC2046
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
+          sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"

.github/workflows/release.yml

@@ -36,3 +36,30 @@ jobs:
         overwrite: true
         tag: ${{ github.ref }}
         file_glob: true
+  ############################################################################################
+  ##################################### Docker images  #######################################
+  ############################################################################################
+  DockerServerImages:
+    runs-on: [self-hosted, style-checker]
+    steps:
+    - name: Clear repository
+      run: |
+        sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
+    - name: Check out repository code
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0  # otherwise we will have no version info
+    - name: Check docker clickhouse/clickhouse-server building
+      run: |
+        cd "$GITHUB_WORKSPACE/tests/ci"
+        python3 docker_server.py --release-type auto --version "${{ github.ref }}"
+        python3 docker_server.py --release-type auto --version "${{ github.ref }}" --no-ubuntu \
+          --image-repo clickhouse/clickhouse-keeper --image-path docker/keeper
+    - name: Cleanup
+      if: always()
+      run: |
+        # shellcheck disable=SC2046
+        docker kill $(docker ps -q) ||:
+        # shellcheck disable=SC2046
+        docker rm -f $(docker ps -a -q) ||:
+        sudo rm -fr "$TEMP_PATH"

.github/workflows/release_branches.yml

@@ -103,8 +103,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
 #########################################################################################
 #################################### ORDINARY BUILDS ####################################
@@ -120,7 +122,6 @@ jobs:
           IMAGES_PATH=${{runner.temp}}/images_path
           REPO_COPY=${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH=${{runner.temp}}/../ccaches
-          CHECK_NAME=ClickHouse build check (actions)
           BUILD_NAME=package_release
           EOF
       - name: Download changed images
@@ -134,25 +135,28 @@ jobs:
       - name: Check out repository code
         uses: actions/checkout@v2
         with:
-          submodules: 'true'
           fetch-depth: 0 # otherwise we will have no info about contributors
       - name: Build
         run: |
+          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
       - name: Upload build URLs to artifacts
         if: ${{ success() || failure() }}
         uses: actions/upload-artifact@v2
         with:
-          name: ${{ env.BUILD_NAME }}
+          name: ${{ env.BUILD_URLS }}
-          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_NAME }}.json
+          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_URLS }}.json
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
   BuilderDebAarch64:
     needs: [DockerHubPush]
@@ -165,7 +169,6 @@ jobs:
           IMAGES_PATH=${{runner.temp}}/images_path
           REPO_COPY=${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH=${{runner.temp}}/../ccaches
-          CHECK_NAME=ClickHouse build check (actions)
           BUILD_NAME=package_aarch64
           EOF
       - name: Download changed images
@@ -176,24 +179,27 @@ jobs:
       - name: Check out repository code
         uses: actions/checkout@v2
         with:
-          submodules: 'true'
           fetch-depth: 0 # otherwise we will have no info about contributors
       - name: Build
         run: |
+          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
       - name: Upload build URLs to artifacts
         uses: actions/upload-artifact@v2
         with:
-          name: ${{ env.BUILD_NAME }}
+          name: ${{ env.BUILD_URLS }}
-          path: ${{ runner.temp }}/build_check/${{ env.BUILD_NAME }}.json
+          path: ${{ runner.temp }}/build_check/${{ env.BUILD_URLS }}.json
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
   BuilderDebAsan:
     needs: [DockerHubPush]
@@ -206,7 +212,6 @@ jobs:
           IMAGES_PATH=${{runner.temp}}/images_path
           REPO_COPY=${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH=${{runner.temp}}/../ccaches
-          CHECK_NAME=ClickHouse build check (actions)
           BUILD_NAME=package_asan
           EOF
       - name: Download changed images
@@ -219,26 +224,27 @@ jobs:
           sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
       - name: Check out repository code
         uses: actions/checkout@v2
-        with:
-          submodules: 'true'
-          fetch-depth: 0 # otherwise we will have no info about contributors
       - name: Build
         run: |
+          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
       - name: Upload build URLs to artifacts
         if: ${{ success() || failure() }}
         uses: actions/upload-artifact@v2
         with:
-          name: ${{ env.BUILD_NAME }}
+          name: ${{ env.BUILD_URLS }}
-          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_NAME }}.json
+          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_URLS }}.json
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
   BuilderDebUBsan:
     needs: [DockerHubPush]
@@ -251,7 +257,6 @@ jobs:
           IMAGES_PATH=${{runner.temp}}/images_path
           REPO_COPY=${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH=${{runner.temp}}/../ccaches
-          CHECK_NAME=ClickHouse build check (actions)
           BUILD_NAME=package_ubsan
           EOF
       - name: Download changed images
@@ -264,26 +269,27 @@ jobs:
           sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
       - name: Check out repository code
         uses: actions/checkout@v2
-        with:
-          submodules: 'true'
-          fetch-depth: 0 # otherwise we will have no info about contributors
       - name: Build
         run: |
+          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
       - name: Upload build URLs to artifacts
         if: ${{ success() || failure() }}
         uses: actions/upload-artifact@v2
         with:
-          name: ${{ env.BUILD_NAME }}
+          name: ${{ env.BUILD_URLS }}
-          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_NAME }}.json
+          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_URLS }}.json
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
   BuilderDebTsan:
     needs: [DockerHubPush]
@@ -296,7 +302,6 @@ jobs:
           IMAGES_PATH=${{runner.temp}}/images_path
           REPO_COPY=${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH=${{runner.temp}}/../ccaches
-          CHECK_NAME=ClickHouse build check (actions)
           BUILD_NAME=package_tsan
           EOF
       - name: Download changed images
@@ -309,26 +314,27 @@ jobs:
           sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
       - name: Check out repository code
         uses: actions/checkout@v2
-        with:
-          submodules: 'true'
-          fetch-depth: 0 # otherwise we will have no info about contributors
       - name: Build
         run: |
+          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
       - name: Upload build URLs to artifacts
         if: ${{ success() || failure() }}
         uses: actions/upload-artifact@v2
         with:
-          name: ${{ env.BUILD_NAME }}
+          name: ${{ env.BUILD_URLS }}
-          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_NAME }}.json
+          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_URLS }}.json
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
   BuilderDebMsan:
     needs: [DockerHubPush]
@@ -341,7 +347,6 @@ jobs:
           IMAGES_PATH=${{runner.temp}}/images_path
           REPO_COPY=${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH=${{runner.temp}}/../ccaches
-          CHECK_NAME=ClickHouse build check (actions)
           BUILD_NAME=package_msan
           EOF
       - name: Download changed images
@@ -354,26 +359,27 @@ jobs:
           sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
       - name: Check out repository code
         uses: actions/checkout@v2
-        with:
-          submodules: 'true'
-          fetch-depth: 0 # otherwise we will have no info about contributors
       - name: Build
         run: |
+          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
       - name: Upload build URLs to artifacts
         if: ${{ success() || failure() }}
         uses: actions/upload-artifact@v2
         with:
-          name: ${{ env.BUILD_NAME }}
+          name: ${{ env.BUILD_URLS }}
-          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_NAME }}.json
+          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_URLS }}.json
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
   BuilderDebDebug:
     needs: [DockerHubPush]
@@ -386,7 +392,6 @@ jobs:
           IMAGES_PATH=${{runner.temp}}/images_path
           REPO_COPY=${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH=${{runner.temp}}/../ccaches
-          CHECK_NAME=ClickHouse build check (actions)
           BUILD_NAME=package_debug
           EOF
       - name: Download changed images
@@ -399,26 +404,27 @@ jobs:
           sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
       - name: Check out repository code
         uses: actions/checkout@v2
-        with:
-          submodules: 'true'
-          fetch-depth: 0 # otherwise we will have no info about contributors
       - name: Build
         run: |
+          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
       - name: Upload build URLs to artifacts
         if: ${{ success() || failure() }}
         uses: actions/upload-artifact@v2
         with:
-          name: ${{ env.BUILD_NAME }}
+          name: ${{ env.BUILD_URLS }}
-          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_NAME }}.json
+          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_URLS }}.json
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
 ############################################################################################
 ##################################### BUILD REPORTER #######################################
@@ -437,9 +443,11 @@ jobs:
       - name: Set envs
         run: |
           cat >> "$GITHUB_ENV" << 'EOF'
-          TEMP_PATH=${{runner.temp}}/report_check
-          REPORTS_PATH=${{runner.temp}}/reports_dir
           CHECK_NAME=ClickHouse build check (actions)
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          TEMP_PATH=${{runner.temp}}/report_check
+          NEEDS_DATA_PATH=${{runner.temp}}/needs.json
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -454,13 +462,18 @@ jobs:
         run: |
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
+          cat > "$NEEDS_DATA_PATH" << 'EOF'
+          ${{ toJSON(needs) }}
+          EOF
           cd "$GITHUB_WORKSPACE/tests/ci"
           python3 build_report_check.py "$CHECK_NAME"
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
 ##############################################################################################
 ########################### FUNCTIONAl STATELESS TESTS #######################################
@@ -497,8 +510,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   FunctionalStatelessTestAarch64:
     needs: [BuilderDebAarch64]
@@ -532,8 +547,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   FunctionalStatelessTestAsan0:
     needs: [BuilderDebAsan]
@@ -569,8 +586,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   FunctionalStatelessTestAsan1:
     needs: [BuilderDebAsan]
@@ -606,8 +625,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   FunctionalStatelessTestTsan0:
     needs: [BuilderDebTsan]
@@ -643,8 +664,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   FunctionalStatelessTestTsan1:
     needs: [BuilderDebTsan]
@@ -680,8 +703,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   FunctionalStatelessTestTsan2:
     needs: [BuilderDebTsan]
@@ -717,8 +742,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   FunctionalStatelessTestUBsan:
     needs: [BuilderDebUBsan]
@@ -752,8 +779,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   FunctionalStatelessTestMsan0:
     needs: [BuilderDebMsan]
@@ -789,8 +818,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   FunctionalStatelessTestMsan1:
     needs: [BuilderDebMsan]
@@ -826,8 +857,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   FunctionalStatelessTestMsan2:
     needs: [BuilderDebMsan]
@@ -863,8 +896,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   FunctionalStatelessTestDebug0:
     needs: [BuilderDebDebug]
@@ -900,8 +935,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   FunctionalStatelessTestDebug1:
     needs: [BuilderDebDebug]
@@ -937,8 +974,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   FunctionalStatelessTestDebug2:
     needs: [BuilderDebDebug]
@@ -974,8 +1013,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
 ##############################################################################################
 ############################ FUNCTIONAl STATEFUL TESTS #######################################
@@ -1012,8 +1053,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   FunctionalStatefulTestAarch64:
     needs: [BuilderDebAarch64]
@@ -1047,8 +1090,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   FunctionalStatefulTestAsan:
     needs: [BuilderDebAsan]
@@ -1082,8 +1127,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   FunctionalStatefulTestTsan:
     needs: [BuilderDebTsan]
@@ -1117,8 +1164,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   FunctionalStatefulTestMsan:
     needs: [BuilderDebMsan]
@@ -1152,8 +1201,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   FunctionalStatefulTestUBsan:
     needs: [BuilderDebUBsan]
@@ -1187,8 +1238,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   FunctionalStatefulTestDebug:
     needs: [BuilderDebDebug]
@@ -1222,8 +1275,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
 ##############################################################################################
 ######################################### STRESS TESTS #######################################
@@ -1259,8 +1314,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   StressTestTsan:
     needs: [BuilderDebTsan]
@@ -1297,8 +1354,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   StressTestMsan:
     needs: [BuilderDebMsan]
@@ -1331,8 +1390,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   StressTestUBsan:
     needs: [BuilderDebUBsan]
@@ -1365,8 +1426,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   StressTestDebug:
     needs: [BuilderDebDebug]
@@ -1399,8 +1462,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
 #############################################################################################
 ############################# INTEGRATION TESTS #############################################
@@ -1438,8 +1503,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   IntegrationTestsAsan1:
     needs: [BuilderDebAsan]
@@ -1474,8 +1541,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   IntegrationTestsAsan2:
     needs: [BuilderDebAsan]
@@ -1510,8 +1579,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   IntegrationTestsTsan0:
     needs: [BuilderDebTsan]
@@ -1546,8 +1617,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   IntegrationTestsTsan1:
     needs: [BuilderDebTsan]
@@ -1582,8 +1655,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   IntegrationTestsTsan2:
     needs: [BuilderDebTsan]
@@ -1618,8 +1693,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   IntegrationTestsTsan3:
     needs: [BuilderDebTsan]
@@ -1654,8 +1731,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   IntegrationTestsRelease0:
     needs: [BuilderDebRelease]
@@ -1690,8 +1769,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   IntegrationTestsRelease1:
     needs: [BuilderDebRelease]
@@ -1726,8 +1807,10 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
   FinishCheck:
     needs:

.github/workflows/tags_stable.yml

@@ -3,9 +3,14 @@ name: TagsStableWorkflow
 # - Sends it to JFROG Artifactory
 # - Adds them to the release assets
 
+env:
+  # Force the stdout and stderr streams to be unbuffered
+  PYTHONUNBUFFERED: 1
+
 on: # yamllint disable-line rule:truthy
   push:
     tags:
+    - 'v*-prestable'
     - 'v*-stable'
     - 'v*-lts'
 
@@ -15,26 +20,36 @@ jobs:
     runs-on: [self-hosted, style-checker]
     steps:
     - name: Get tag name
-      run: echo "GITHUB_TAG=${GITHUB_REF#refs/tags/}" >> "$GITHUB_ENV"
+      run: |
+        echo "GITHUB_TAG=${GITHUB_REF#refs/tags/}" >> "$GITHUB_ENV"
     - name: Check out repository code
       uses: actions/checkout@v2
       with:
         ref: master
+        fetch-depth: 0
     - name: Generate versions
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        git fetch --tags
         ./utils/list-versions/list-versions.sh > ./utils/list-versions/version_date.tsv
+        GID=$(id -g "${UID}")
+        docker run -u "${UID}:${GID}" -e PYTHONUNBUFFERED=1 \
+            --volume="${GITHUB_WORKSPACE}:/ClickHouse" clickhouse/style-test \
+                /ClickHouse/utils/changelog/changelog.py -vv --gh-user-or-token="$GITHUB_TOKEN" \
+                --output="/ClickHouse/docs/changelogs/${GITHUB_TAG}.md" --jobs=5 "${GITHUB_TAG}"
+        git add "./docs/changelogs/${GITHUB_TAG}.md"
+        git diff HEAD
     - name: Create Pull Request
       uses: peter-evans/create-pull-request@v3
       with:
         author: "robot-clickhouse <robot-clickhouse@users.noreply.github.com>"
         committer: "robot-clickhouse <robot-clickhouse@users.noreply.github.com>"
-        commit-message: Update version_date.tsv after ${{ env.GITHUB_TAG }}
+        commit-message: Update version_date.tsv and changelogs after ${{ env.GITHUB_TAG }}
         branch: auto/${{ env.GITHUB_TAG }}
         delete-branch: true
-        title: Update version_date.tsv after ${{ env.GITHUB_TAG }}
+        title: Update version_date.tsv and changelogs after ${{ env.GITHUB_TAG }}
         body: |
-          Update version_date.tsv after ${{ env.GITHUB_TAG }}
+          Update version_date.tsv and changelogs after ${{ env.GITHUB_TAG }}
 
-          Changelog category (leave one):
+          ### Changelog category (leave one):
           - Not for changelog (changelog entry is not required)

.github/workflows/woboq.yml

@@ -37,6 +37,8 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
-          docker kill "$(docker ps -q)" ||:
+          # shellcheck disable=SC2046
-          docker rm -f "$(docker ps -a -q)" ||:
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"

.gitignore

@@ -33,10 +33,6 @@
 /docs/zh/single.md
 /docs/ja/single.md
 /docs/fa/single.md
-/docs/en/development/cmake-in-clickhouse.md
-/docs/ja/development/cmake-in-clickhouse.md
-/docs/zh/development/cmake-in-clickhouse.md
-/docs/ru/development/cmake-in-clickhouse.md
 
 # callgrind files
 callgrind.out.*

.gitmodules

@@ -262,3 +262,9 @@
 [submodule "contrib/minizip-ng"]
 	path = contrib/minizip-ng
 	url = https://github.com/zlib-ng/minizip-ng
+[submodule "contrib/wyhash"]
+	path = contrib/wyhash
+	url = https://github.com/wangyi-fudan/wyhash.git
+[submodule "contrib/hashidsxx"]
+	path = contrib/hashidsxx
+	url = https://github.com/schoentoon/hashidsxx.git

CHANGELOG.md

@@ -1,9 +1,324 @@
 ### Table of Contents
+**[ClickHouse release v22.5, 2022-05-19](#225)**<br>
+**[ClickHouse release v22.4, 2022-04-20](#224)**<br>
 **[ClickHouse release v22.3-lts, 2022-03-17](#223)**<br>
 **[ClickHouse release v22.2, 2022-02-17](#222)**<br>
 **[ClickHouse release v22.1, 2022-01-18](#221)**<br>
 **[Changelog for 2021](https://github.com/ClickHouse/ClickHouse/blob/master/docs/en/whats-new/changelog/2021.md)**<br>
 
+### <a id="225"></a> ClickHouse release 22.5, 2022-05-19
+
+#### Upgrade Notes
+
+* Now, background merges, mutations and `OPTIMIZE` will not increment `SelectedRows` and `SelectedBytes` metrics. They (still) will increment `MergedRows` and `MergedUncompressedBytes` as it was before. This only affects the metric values, and makes them better. This change does not introduce any incompatibility, but you may wonder about the changes of metrics, so we put in this category. [#37040](https://github.com/ClickHouse/ClickHouse/pull/37040) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Updated the BoringSSL module to the official FIPS compliant version. This makes ClickHouse FIPS compliant. [#35914](https://github.com/ClickHouse/ClickHouse/pull/35914) ([Meena-Renganathan](https://github.com/Meena-Renganathan)). The ciphers `aes-192-cfb128` and `aes-256-cfb128` were removed, because they are not included in the FIPS certified version of BoringSSL.
+* `max_memory_usage` setting is removed from the default user profile in `users.xml`. This enables flexible memory limits for queries instead of the old rigid limit of 10 GB.
+* Disable `log_query_threads` setting by default. It controls the logging of statistics about every thread participating in query execution. After supporting asynchronous reads, the total number of distinct thread ids became too large, and logging into the `query_thread_log` has become too heavy. [#37077](https://github.com/ClickHouse/ClickHouse/pull/37077) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove function `groupArraySorted` which has a bug. [#36822](https://github.com/ClickHouse/ClickHouse/pull/36822) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+
+#### New Feature
+
+* Enable memory overcommit by default. [#35921](https://github.com/ClickHouse/ClickHouse/pull/35921) ([Dmitry Novik](https://github.com/novikd)).
+* Add support of GROUPING SETS in GROUP BY clause. This implementation supports a parallel processing of grouping sets. [#33631](https://github.com/ClickHouse/ClickHouse/pull/33631) ([Dmitry Novik](https://github.com/novikd)).
+* Added `system.certificates` table. [#37142](https://github.com/ClickHouse/ClickHouse/pull/37142) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Adds `h3Line`, `h3Distance` and `h3HexRing` functions. [#37030](https://github.com/ClickHouse/ClickHouse/pull/37030) ([Bharat Nallan](https://github.com/bharatnc)).
+* New single binary based diagnostics tool (clickhouse-diagnostics). [#36705](https://github.com/ClickHouse/ClickHouse/pull/36705) ([Dale McDiarmid](https://github.com/gingerwizard)).
+* Add output format `Prometheus` [#36051](https://github.com/ClickHouse/ClickHouse/issues/36051). [#36206](https://github.com/ClickHouse/ClickHouse/pull/36206) ([Vladimir C](https://github.com/vdimir)).
+* Add `MySQLDump` input format. It reads all data from INSERT queries belonging to one table in dump. If there are more than one table, by default it reads data from the first one. [#36667](https://github.com/ClickHouse/ClickHouse/pull/36667) ([Kruglov Pavel](https://github.com/Avogar)).
+* Show the `total_rows` and `total_bytes` fields in `system.tables` for temporary tables. [#36401](https://github.com/ClickHouse/ClickHouse/issues/36401). [#36439](https://github.com/ClickHouse/ClickHouse/pull/36439) ([xiedeyantu](https://github.com/xiedeyantu)).
+* Allow to override `parts_to_delay_insert` and `parts_to_throw_insert` with query-level settings. If they are defined, they will override table-level settings. [#36371](https://github.com/ClickHouse/ClickHouse/pull/36371) ([Memo](https://github.com/Joeywzr)).
+
+#### Experimental Feature
+
+* Implemented L1, L2, Linf, Cosine distance functions for arrays and L1, L2, Linf norm functions for arrays.
+ [#37033](https://github.com/ClickHouse/ClickHouse/pull/37033) ([qieqieplus](https://github.com/qieqieplus)). Caveat: the functions will be renamed.
+* Improve the `WATCH` query in WindowView: 1. Reduce the latency of providing query results by calling the `fire_condition` signal. 2. Makes the cancel query operation(ctrl-c) faster, by checking `isCancelled()` more frequently. [#37226](https://github.com/ClickHouse/ClickHouse/pull/37226) ([vxider](https://github.com/Vxider)).
+* Introspection for remove filesystem cache. [#36802](https://github.com/ClickHouse/ClickHouse/pull/36802) ([Han Shukai](https://github.com/KinderRiven)).
+* Added new hash function `wyHash64` for SQL. [#36467](https://github.com/ClickHouse/ClickHouse/pull/36467) ([olevino](https://github.com/olevino)).
+* Improvement for replicated databases: Added `SYSTEM SYNC DATABASE REPLICA` query which allows to sync tables metadata inside Replicated database, because currently synchronisation is asynchronous. [#35944](https://github.com/ClickHouse/ClickHouse/pull/35944) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Improvement for remote filesystem cache: Better read from cache. [#37054](https://github.com/ClickHouse/ClickHouse/pull/37054) ([Kseniia Sumarokova](https://github.com/kssenii)). Improve `SYSTEM DROP FILESYSTEM CACHE` query: `<path>` option and `FORCE` option. [#36639](https://github.com/ClickHouse/ClickHouse/pull/36639) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Improvement for semistructured data: Allow to cast columns of type `Object(...)` to `Object(Nullable(...))`. [#36564](https://github.com/ClickHouse/ClickHouse/pull/36564) ([awakeljw](https://github.com/awakeljw)).
+* Improvement for parallel replicas: We create a local interpreter if we want to execute query on localhost replica. But for when executing query on multiple replicas we rely on the fact that a connection exists so replicas can talk to coordinator. It is now improved and localhost replica can talk to coordinator directly in the same process. [#36281](https://github.com/ClickHouse/ClickHouse/pull/36281) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+
+#### Performance Improvement
+
+* Improve performance of `avg`, `sum` aggregate functions if used without GROUP BY expression. [#37257](https://github.com/ClickHouse/ClickHouse/pull/37257) ([Maksim Kita](https://github.com/kitaisreal)).
+* Improve performance of unary arithmetic functions (`bitCount`, `bitNot`, `abs`, `intExp2`, `intExp10`, `negate`, `roundAge`, `roundDuration`, `roundToExp2`, `sign`) using dynamic dispatch. [#37289](https://github.com/ClickHouse/ClickHouse/pull/37289) ([Maksim Kita](https://github.com/kitaisreal)).
+* Improve performance of ORDER BY, MergeJoin, insertion into MergeTree using JIT compilation of sort columns comparator. [#34469](https://github.com/ClickHouse/ClickHouse/pull/34469) ([Maksim Kita](https://github.com/kitaisreal)).
+* Change structure of `system.asynchronous_metric_log`. It will take about 10 times less space. This closes [#36357](https://github.com/ClickHouse/ClickHouse/issues/36357). The field `event_time_microseconds` was removed, because it is useless. [#36360](https://github.com/ClickHouse/ClickHouse/pull/36360) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Load marks for only necessary columns when reading wide parts. [#36879](https://github.com/ClickHouse/ClickHouse/pull/36879) ([Anton Kozlov](https://github.com/tonickkozlov)).
+* Improves performance of file descriptor cache by narrowing mutex scopes. [#36682](https://github.com/ClickHouse/ClickHouse/pull/36682) ([Anton Kozlov](https://github.com/tonickkozlov)).
+* Improve performance of reading from storage `File` and table functions `file` in case when path has globs and matched directory contains large number of files. [#36647](https://github.com/ClickHouse/ClickHouse/pull/36647) ([Anton Popov](https://github.com/CurtizJ)).
+* Apply parallel parsing for input format `HiveText`, which can speed up HiveText parsing by 2x when reading local file. [#36650](https://github.com/ClickHouse/ClickHouse/pull/36650) ([李扬](https://github.com/taiyang-li)).
+* The default `HashJoin` is not thread safe for inserting right table's rows and run it in a single thread. When the right table is large, the join process is too slow with low cpu utilization. [#36415](https://github.com/ClickHouse/ClickHouse/pull/36415) ([lgbo](https://github.com/lgbo-ustc)).
+* Allow to rewrite `select countDistinct(a) from t` to `select count(1) from (select a from t groupBy a)`. [#35993](https://github.com/ClickHouse/ClickHouse/pull/35993) ([zhanglistar](https://github.com/zhanglistar)).
+* Transform OR LIKE chain to multiMatchAny. Will enable once we have more confidence it works. [#34932](https://github.com/ClickHouse/ClickHouse/pull/34932) ([Daniel Kutenin](https://github.com/danlark1)).
+* Improve performance of some functions with inlining. [#34544](https://github.com/ClickHouse/ClickHouse/pull/34544) ([Daniel Kutenin](https://github.com/danlark1)).
+* Add a branch to avoid unnecessary memcpy in readBig. It improves performance somewhat. [#36095](https://github.com/ClickHouse/ClickHouse/pull/36095) ([jasperzhu](https://github.com/jinjunzh)).
+* Implement partial GROUP BY key for optimize_aggregation_in_order. [#35111](https://github.com/ClickHouse/ClickHouse/pull/35111) ([Azat Khuzhin](https://github.com/azat)).
+
+#### Improvement
+ 
+* Show names of erroneous files in case of parsing errors while executing table functions `file`, `s3` and `url`. [#36314](https://github.com/ClickHouse/ClickHouse/pull/36314) ([Anton Popov](https://github.com/CurtizJ)).
+* Allowed to increase the number of threads for executing background operations (merges, mutations, moves and fetches) at runtime if they are specified at top level config. [#36425](https://github.com/ClickHouse/ClickHouse/pull/36425) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Now date time conversion functions that generates time before 1970-01-01 00:00:00 with partial hours/minutes timezones will be saturated to zero instead of overflow. This is the continuation of https://github.com/ClickHouse/ClickHouse/pull/29953 which addresses https://github.com/ClickHouse/ClickHouse/pull/29953#discussion_r800550280 . Mark as improvement because it's implementation defined behavior (and very rare case) and we are allowed to break it. [#36656](https://github.com/ClickHouse/ClickHouse/pull/36656) ([Amos Bird](https://github.com/amosbird)).
+* Add a warning if someone running clickhouse-server with log level "test". The log level "test" was added recently and cannot be used in production due to inevitable, unavoidable, fatal and life-threatening performance degradation. [#36824](https://github.com/ClickHouse/ClickHouse/pull/36824) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Parse collations in CREATE TABLE, throw exception or ignore. closes [#35892](https://github.com/ClickHouse/ClickHouse/issues/35892). [#36271](https://github.com/ClickHouse/ClickHouse/pull/36271) ([yuuch](https://github.com/yuuch)).
+* Option `compatibility_ignore_auto_increment_in_create_table` allows ignoring `AUTO_INCREMENT` keyword in a column declaration to simplify migration from MySQL. [#37178](https://github.com/ClickHouse/ClickHouse/pull/37178) ([Igor Nikonov](https://github.com/devcrafter)).
+* Add aliases `JSONLines` and `NDJSON` for `JSONEachRow`. Closes [#36303](https://github.com/ClickHouse/ClickHouse/issues/36303). [#36327](https://github.com/ClickHouse/ClickHouse/pull/36327) ([flynn](https://github.com/ucasfl)).
+* Limit the max partitions could be queried for each hive table. Avoid resource overruns. [#37281](https://github.com/ClickHouse/ClickHouse/pull/37281) ([lgbo](https://github.com/lgbo-ustc)).
+* Added implicit cast for `h3kRing` function second argument to improve usability. Closes [#35432](https://github.com/ClickHouse/ClickHouse/issues/35432). [#37189](https://github.com/ClickHouse/ClickHouse/pull/37189) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix progress indication for `INSERT SELECT` in `clickhouse-local` for any query and for file progress in client, more correct file progress. [#37075](https://github.com/ClickHouse/ClickHouse/pull/37075) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix bug which can lead to forgotten outdated parts in MergeTree table engines family in case of filesystem failures during parts removal. Before fix they will be removed only after first server restart. [#37014](https://github.com/ClickHouse/ClickHouse/pull/37014) ([alesapin](https://github.com/alesapin)).
+* Implemented a new mode of handling row policies which can be enabled in the main configuration which enables users without permissive row policies to read rows. [#36997](https://github.com/ClickHouse/ClickHouse/pull/36997) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Play UI: Nullable numbers will be aligned to the right in table cells. This closes [#36982](https://github.com/ClickHouse/ClickHouse/issues/36982). [#36988](https://github.com/ClickHouse/ClickHouse/pull/36988) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Play UI: If there is one row in result and more than a few columns, display the result vertically. Continuation of [#36811](https://github.com/ClickHouse/ClickHouse/issues/36811). [#36842](https://github.com/ClickHouse/ClickHouse/pull/36842) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Cleanup CSS in Play UI. The pixels are more evenly placed. Better usability for long content in table cells. [#36569](https://github.com/ClickHouse/ClickHouse/pull/36569) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Finalize write buffers in case of exception to avoid doing it in destructors. Hope it fixes: [#36907](https://github.com/ClickHouse/ClickHouse/issues/36907). [#36979](https://github.com/ClickHouse/ClickHouse/pull/36979) ([Kruglov Pavel](https://github.com/Avogar)).
+* After [#36425](https://github.com/ClickHouse/ClickHouse/issues/36425) settings like `background_fetches_pool_size` became obsolete and can appear in top level config, but clickhouse throws and exception like `Error updating configuration from '/etc/clickhouse-server/config.xml' config.: Code: 137. DB::Exception: A setting 'background_fetches_pool_size' appeared at top level in config /etc/clickhouse-server/config.xml.` This is fixed. [#36917](https://github.com/ClickHouse/ClickHouse/pull/36917) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Add extra diagnostic info (if applicable) when sending exception to other server. [#36872](https://github.com/ClickHouse/ClickHouse/pull/36872) ([tavplubix](https://github.com/tavplubix)).
+* Allow to execute hash functions with arguments of type `Array(Tuple(..))`. [#36812](https://github.com/ClickHouse/ClickHouse/pull/36812) ([Anton Popov](https://github.com/CurtizJ)).
+* Added `user_defined_path` config setting. [#36753](https://github.com/ClickHouse/ClickHouse/pull/36753) ([Maksim Kita](https://github.com/kitaisreal)).
+* Allow cluster macro in `s3Cluster` table function. [#36726](https://github.com/ClickHouse/ClickHouse/pull/36726) ([Vadim Volodin](https://github.com/PolyProgrammist)).
+* Properly cancel INSERT queries in `clickhouse-client`/`clickhouse-local`. [#36710](https://github.com/ClickHouse/ClickHouse/pull/36710) ([Azat Khuzhin](https://github.com/azat)).
+* Allow to cancel a query while still keeping a decent query id in `MySQLHandler`. [#36699](https://github.com/ClickHouse/ClickHouse/pull/36699) ([Amos Bird](https://github.com/amosbird)).
+* Add `is_all_data_sent` column into `system.processes`, and improve internal testing hardening check based on it. [#36649](https://github.com/ClickHouse/ClickHouse/pull/36649) ([Azat Khuzhin](https://github.com/azat)).
+* The metrics about time spent reading from s3 now calculated correctly. Close [#35483](https://github.com/ClickHouse/ClickHouse/issues/35483). [#36572](https://github.com/ClickHouse/ClickHouse/pull/36572) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Allow file descriptors in table function file if it is run in clickhouse-local. [#36562](https://github.com/ClickHouse/ClickHouse/pull/36562) ([wuxiaobai24](https://github.com/wuxiaobai24)).
+* Allow names of tuple elements that start from digits. [#36544](https://github.com/ClickHouse/ClickHouse/pull/36544) ([Anton Popov](https://github.com/CurtizJ)).
+* Now clickhouse-benchmark can read authentication info from environment variables. [#36497](https://github.com/ClickHouse/ClickHouse/pull/36497) ([Anton Kozlov](https://github.com/tonickkozlov)).
+* `clickhouse-keeper` improvement: add support for force recovery which allows you to reconfigure cluster without quorum. [#36258](https://github.com/ClickHouse/ClickHouse/pull/36258) ([Antonio Andelic](https://github.com/antonio2368)).
+* Improve schema inference for JSON objects. [#36207](https://github.com/ClickHouse/ClickHouse/pull/36207) ([Kruglov Pavel](https://github.com/Avogar)).
+* Refactor code around schema inference with globs. Try next file from glob only if it makes sense (previously we tried next file in case of any error). Also it fixes [#36317](https://github.com/ClickHouse/ClickHouse/issues/36317). [#36205](https://github.com/ClickHouse/ClickHouse/pull/36205) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add a separate `CLUSTER` grant (and `access_control_improvements.on_cluster_queries_require_cluster_grant` configuration directive, for backward compatibility, default to `false`). [#35767](https://github.com/ClickHouse/ClickHouse/pull/35767) ([Azat Khuzhin](https://github.com/azat)).
+* If the required amount of memory is available before the selected query stopped, all waiting queries continue execution. Now we don't stop any query if memory is freed before the moment when the selected query knows about the cancellation. [#35637](https://github.com/ClickHouse/ClickHouse/pull/35637) ([Dmitry Novik](https://github.com/novikd)).
+* Nullables detection in protobuf. In proto3, default values are not sent on the wire. This makes it non-trivial to distinguish between null and default values for Nullable columns. A standard way to deal with this problem is to use Google wrappers to nest the target value within an inner message (see https://github.com/protocolbuffers/protobuf/blob/master/src/google/protobuf/wrappers.proto). In this case, a missing field is interpreted as null value, a field with missing value if interpreted as default value, and a field with regular value is interpreted as regular value. However, ClickHouse interprets Google wrappers as nested columns. We propose to introduce special behaviour to detect Google wrappers and interpret them like in the description above. For example, to serialize values for a Nullable column `test`, we would use `google.protobuf.StringValue test` in our .proto schema. Note that these types are so called "well-known types" in Protobuf, implemented in the library itself. [#35149](https://github.com/ClickHouse/ClickHouse/pull/35149) ([Jakub Kuklis](https://github.com/jkuklis)).
+* Added support for specifying `content_type` in predefined and static HTTP handler config. [#34916](https://github.com/ClickHouse/ClickHouse/pull/34916) ([Roman Nikonov](https://github.com/nic11)).
+* Warn properly if use clickhouse-client --file without preceeding --external. Close [#34747](https://github.com/ClickHouse/ClickHouse/issues/34747). [#34765](https://github.com/ClickHouse/ClickHouse/pull/34765) ([李扬](https://github.com/taiyang-li)).
+* Improve MySQL database engine to compatible with binary(0) dataType. [#37232](https://github.com/ClickHouse/ClickHouse/pull/37232) ([zzsmdfj](https://github.com/zzsmdfj)).
+* Improve JSON report of clickhouse-benchmark. [#36473](https://github.com/ClickHouse/ClickHouse/pull/36473) ([Tian Xinhui](https://github.com/xinhuitian)).
+* Server might refuse to start if it cannot resolve hostname of external ClickHouse dictionary. It's fixed. Fixes [#36451](https://github.com/ClickHouse/ClickHouse/issues/36451). [#36463](https://github.com/ClickHouse/ClickHouse/pull/36463) ([tavplubix](https://github.com/tavplubix)).
+
+#### Build/Testing/Packaging Improvement
+
+* Now `clickhouse-keeper` for the `x86_64` architecture is statically linked with [musl](https://musl.libc.org/) and doesn't depend on any system libraries. [#31833](https://github.com/ClickHouse/ClickHouse/pull/31833) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* ClickHouse builds for `PowerPC64LE` architecture are now available in universal installation script `curl https://clickhouse.com/ | sh` and by direct link `https://builds.clickhouse.com/master/powerpc64le/clickhouse`. [#37095](https://github.com/ClickHouse/ClickHouse/pull/37095) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Limit PowerPC code generation to Power8 for better compatibility. This closes [#36025](https://github.com/ClickHouse/ClickHouse/issues/36025). [#36529](https://github.com/ClickHouse/ClickHouse/pull/36529) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Simplify performance test. This will give a chance for us to use it. [#36769](https://github.com/ClickHouse/ClickHouse/pull/36769) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fail performance comparison on errors in the report. [#34797](https://github.com/ClickHouse/ClickHouse/pull/34797) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add ZSTD support for Arrow. This fixes [#35283](https://github.com/ClickHouse/ClickHouse/issues/35283). [#35486](https://github.com/ClickHouse/ClickHouse/pull/35486) ([Sean Lafferty](https://github.com/seanlaff)).
+
+#### Bug Fix
+
+* Extracts Version ID if present from the URI and adds a request to the AWS HTTP URI. Closes [#31221](https://github.com/ClickHouse/ClickHouse/issues/31221). - [x] Extract `Version ID` from URI if present and reassemble without it. - [x] Configure `AWS HTTP URI` object with request. - [x] Unit Tests: [`gtest_s3_uri`](https://github.com/ClickHouse/ClickHouse/blob/2340a6c6849ebc05a8efbf97ba8de3ff9dc0eff4/src/IO/tests/gtest_s3_uri.cpp) - [x] Drop instrumentation commit. [#34571](https://github.com/ClickHouse/ClickHouse/pull/34571) ([Saad Ur Rahman](https://github.com/surahman)).
+* Fix system.opentelemetry_span_log attribute.values alias to values instead of keys. [#37275](https://github.com/ClickHouse/ClickHouse/pull/37275) ([Aleksandr Razumov](https://github.com/ernado)).
+* Fix Nullable(String) to Nullable(Bool/IPv4/IPv6) conversion Closes [#37221](https://github.com/ClickHouse/ClickHouse/issues/37221). [#37270](https://github.com/ClickHouse/ClickHouse/pull/37270) ([Kruglov Pavel](https://github.com/Avogar)).
+* Experimental feature: Fix execution of mutations in tables, in which there exist columns of type `Object`. Using subcolumns of type `Object` in `WHERE` expression of `UPDATE` or `DELETE` queries is now allowed yet, as well as manipulating (`DROP`, `MODIFY`) of separate subcolumns. Fixes [#37205](https://github.com/ClickHouse/ClickHouse/issues/37205). [#37266](https://github.com/ClickHouse/ClickHouse/pull/37266) ([Anton Popov](https://github.com/CurtizJ)).
+* Kafka does not need `group.id` on producer stage. In console log you can find Warning that describe this issue: ``` 2022.05.15 17:59:13.270227 [ 137 ] {} <Warning> StorageKafka (topic-name): [rdk:CONFWARN] [thrd:app]: Configuration property group.id is a consumer property and will be ignored by this producer instance ```. [#37228](https://github.com/ClickHouse/ClickHouse/pull/37228) ([Mark Andreev](https://github.com/mrk-andreev)).
+* Experimental feature (WindowView): Update `max_fired_watermark ` after blocks actually fired, in case delete data that hasn't been fired yet. [#37225](https://github.com/ClickHouse/ClickHouse/pull/37225) ([vxider](https://github.com/Vxider)).
+* Fix "Cannot create column of type Set" for distributed queries with LIMIT BY. [#37193](https://github.com/ClickHouse/ClickHouse/pull/37193) ([Azat Khuzhin](https://github.com/azat)).
+* Experimental feature: Now WindowView `WATCH EVENTS` query will not be terminated due to the nonempty Chunk created in `WindowViewSource.h:58`. [#37182](https://github.com/ClickHouse/ClickHouse/pull/37182) ([vxider](https://github.com/Vxider)).
+* Enable `enable_global_with_statement` for subqueries, close [#37141](https://github.com/ClickHouse/ClickHouse/issues/37141). [#37166](https://github.com/ClickHouse/ClickHouse/pull/37166) ([Vladimir C](https://github.com/vdimir)).
+* Fix implicit cast for optimize_skip_unused_shards_rewrite_in. [#37153](https://github.com/ClickHouse/ClickHouse/pull/37153) ([Azat Khuzhin](https://github.com/azat)).
+* The ILIKE function on FixedString columns could have returned wrong results (i.e. match less than it should). [#37117](https://github.com/ClickHouse/ClickHouse/pull/37117) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix `GROUP BY` `AggregateFunction` (i.e. you `GROUP BY` by the column that has `AggregateFunction` type). [#37093](https://github.com/ClickHouse/ClickHouse/pull/37093) ([Azat Khuzhin](https://github.com/azat)).
+* Experimental feature: Fix optimize_aggregation_in_order with prefix GROUP BY and *Array aggregate functions. [#37050](https://github.com/ClickHouse/ClickHouse/pull/37050) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed performance degradation of some INSERT SELECT queries with implicit aggregation. Fixes [#36792](https://github.com/ClickHouse/ClickHouse/issues/36792). [#37047](https://github.com/ClickHouse/ClickHouse/pull/37047) ([tavplubix](https://github.com/tavplubix)).
+* Experimental feature: Fix in-order `GROUP BY` (`optimize_aggregation_in_order=1`) with `*Array` (`groupArrayArray`/...) aggregate functions. [#37046](https://github.com/ClickHouse/ClickHouse/pull/37046) ([Azat Khuzhin](https://github.com/azat)).
+* Fix LowCardinality->ArrowDictionary invalid output when type of indexes is not UInt8. Closes [#36832](https://github.com/ClickHouse/ClickHouse/issues/36832). [#37043](https://github.com/ClickHouse/ClickHouse/pull/37043) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fixed problem with infs in `quantileTDigest`. Fixes [#32107](https://github.com/ClickHouse/ClickHouse/issues/32107). [#37021](https://github.com/ClickHouse/ClickHouse/pull/37021) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Fix sending external tables data in HedgedConnections with max_parallel_replicas != 1. [#36981](https://github.com/ClickHouse/ClickHouse/pull/36981) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fixed logical error on `TRUNCATE` query in `Replicated` database. Fixes [#33747](https://github.com/ClickHouse/ClickHouse/issues/33747). [#36976](https://github.com/ClickHouse/ClickHouse/pull/36976) ([tavplubix](https://github.com/tavplubix)).
+* Experimental feature: Fix stuck when dropping source table in WindowView. Closes [#35678](https://github.com/ClickHouse/ClickHouse/issues/35678). [#36967](https://github.com/ClickHouse/ClickHouse/pull/36967) ([vxider](https://github.com/Vxider)).
+* Experimental feature (rocksdb cache): Fix issue: [#36671](https://github.com/ClickHouse/ClickHouse/issues/36671). [#36929](https://github.com/ClickHouse/ClickHouse/pull/36929) ([李扬](https://github.com/taiyang-li)).
+* Experimental feature: Fix bugs when using multiple columns in WindowView by adding converting actions to make it possible to call`writeIntoWindowView` with a slightly different schema. [#36928](https://github.com/ClickHouse/ClickHouse/pull/36928) ([vxider](https://github.com/Vxider)).
+* Fix bug in clickhouse-keeper which can lead to corrupted compressed log files in case of small load and restarts. [#36910](https://github.com/ClickHouse/ClickHouse/pull/36910) ([alesapin](https://github.com/alesapin)).
+* Fix incorrect query result when doing constant aggregation. This fixes [#36728](https://github.com/ClickHouse/ClickHouse/issues/36728) . [#36888](https://github.com/ClickHouse/ClickHouse/pull/36888) ([Amos Bird](https://github.com/amosbird)).
+* Experimental feature: Fix `current_size` count in cache. [#36887](https://github.com/ClickHouse/ClickHouse/pull/36887) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Experimental feature: Fix fire in window view with hop window [#34044](https://github.com/ClickHouse/ClickHouse/issues/34044). [#36861](https://github.com/ClickHouse/ClickHouse/pull/36861) ([vxider](https://github.com/Vxider)).
+* Experimental feature: Fix incorrect cast in cached buffer from remote fs. [#36809](https://github.com/ClickHouse/ClickHouse/pull/36809) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix creation of tables with `flatten_nested = 0`. Previously unflattened `Nested` columns could be flattened after server restart. [#36803](https://github.com/ClickHouse/ClickHouse/pull/36803) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix some issues with async reads from remote filesystem which happened when reading low cardinality. [#36763](https://github.com/ClickHouse/ClickHouse/pull/36763) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Experimental feature: Fix insertion to columns of type `Object` from multiple files, e.g. via table function `file` with globs. [#36762](https://github.com/ClickHouse/ClickHouse/pull/36762) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix timeouts in Hedged requests. Connection hang right after sending remote query could lead to eternal waiting. [#36749](https://github.com/ClickHouse/ClickHouse/pull/36749) ([Kruglov Pavel](https://github.com/Avogar)).
+* Experimental feature: Fix a bug of `groupBitmapAndState`/`groupBitmapOrState`/`groupBitmapXorState` on distributed table. [#36739](https://github.com/ClickHouse/ClickHouse/pull/36739) ([Zhang Yifan](https://github.com/zhangyifan27)).
+* Experimental feature: During the [test](https://s3.amazonaws.com/clickhouse-test-reports/36376/1cb1c7275cb53769ab826772db9b71361bb3e413/stress_test__thread__actions_/clickhouse-server.clean.log) in [PR](https://github.com/ClickHouse/ClickHouse/pull/36376), I found that the one cache class was initialized twice, it throws a exception. Although the cause of this problem is not clear, there should be code logic of repeatedly loading disk in ClickHouse, so we need to make special judgment for this situation. [#36737](https://github.com/ClickHouse/ClickHouse/pull/36737) ([Han Shukai](https://github.com/KinderRiven)).
+* Fix vertical merges in wide parts. Previously an exception `There is no column` can be thrown during merge. [#36707](https://github.com/ClickHouse/ClickHouse/pull/36707) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix server reload on port change (do not wait for current connections from query context). [#36700](https://github.com/ClickHouse/ClickHouse/pull/36700) ([Azat Khuzhin](https://github.com/azat)).
+* Experimental feature: In the previous [PR](https://github.com/ClickHouse/ClickHouse/pull/36376), I found that testing (stateless tests, flaky check (address, actions)) is timeout. Moreover, testing locally can also trigger unstable system deadlocks. This problem still exists when using the latest source code of master. [#36697](https://github.com/ClickHouse/ClickHouse/pull/36697) ([Han Shukai](https://github.com/KinderRiven)).
+* Experimental feature: Fix server restart if cache configuration changed. [#36685](https://github.com/ClickHouse/ClickHouse/pull/36685) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix possible heap-use-after-free in schema inference. Closes [#36661](https://github.com/ClickHouse/ClickHouse/issues/36661). [#36679](https://github.com/ClickHouse/ClickHouse/pull/36679) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fixed parsing of query settings in `CREATE` query when engine is not specified. Fixes https://github.com/ClickHouse/ClickHouse/pull/34187#issuecomment-1103812419. [#36642](https://github.com/ClickHouse/ClickHouse/pull/36642) ([tavplubix](https://github.com/tavplubix)).
+* Experimental feature: Fix merges of wide parts with type `Object`. [#36637](https://github.com/ClickHouse/ClickHouse/pull/36637) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix format crash when default expression follow EPHEMERAL not literal. Closes [#36618](https://github.com/ClickHouse/ClickHouse/issues/36618). [#36633](https://github.com/ClickHouse/ClickHouse/pull/36633) ([flynn](https://github.com/ucasfl)).
+* Fix `Missing column` exception which could happen while using `INTERPOLATE` with `ENGINE = MergeTree` table. [#36549](https://github.com/ClickHouse/ClickHouse/pull/36549) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Fix potential error with literals in `WHERE` for join queries. Close [#36279](https://github.com/ClickHouse/ClickHouse/issues/36279). [#36542](https://github.com/ClickHouse/ClickHouse/pull/36542) ([Vladimir C](https://github.com/vdimir)).
+* Fix offset update ReadBufferFromEncryptedFile, which could cause undefined behaviour. [#36493](https://github.com/ClickHouse/ClickHouse/pull/36493) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix hostname sanity checks for Keeper cluster configuration. Add `keeper_server.host_checks_enabled` config to enable/disable those checks. [#36492](https://github.com/ClickHouse/ClickHouse/pull/36492) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix usage of executable user defined functions in GROUP BY. Before executable user defined functions cannot be used as expressions in GROUP BY. Closes [#36448](https://github.com/ClickHouse/ClickHouse/issues/36448). [#36486](https://github.com/ClickHouse/ClickHouse/pull/36486) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix possible exception with unknown packet from server in client. [#36481](https://github.com/ClickHouse/ClickHouse/pull/36481) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Experimental feature (please never use `system.session_log`, it is going to be removed): Add missing enum values in system.session_log table. Closes [#36474](https://github.com/ClickHouse/ClickHouse/issues/36474). [#36480](https://github.com/ClickHouse/ClickHouse/pull/36480) ([Memo](https://github.com/Joeywzr)).
+* Fix bug in s3Cluster schema inference that let to the fact that not all data was read in the select from s3Cluster. The bug appeared in https://github.com/ClickHouse/ClickHouse/pull/35544. [#36434](https://github.com/ClickHouse/ClickHouse/pull/36434) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix nullptr dereference in JOIN and COLUMNS matcher. This fixes [#36416](https://github.com/ClickHouse/ClickHouse/issues/36416). This is for https://github.com/ClickHouse/ClickHouse/pull/36417. [#36430](https://github.com/ClickHouse/ClickHouse/pull/36430) ([Amos Bird](https://github.com/amosbird)).
+* Fix dictionary reload for `ClickHouseDictionarySource` if it contains scalar subqueries. [#36390](https://github.com/ClickHouse/ClickHouse/pull/36390) ([lthaooo](https://github.com/lthaooo)).
+* Fix assertion in JOIN, close [#36199](https://github.com/ClickHouse/ClickHouse/issues/36199). [#36201](https://github.com/ClickHouse/ClickHouse/pull/36201) ([Vladimir C](https://github.com/vdimir)).
+* Queries with aliases inside special operators returned parsing error (was broken in 22.1). Example: `SELECT substring('test' AS t, 1, 1)`. [#36167](https://github.com/ClickHouse/ClickHouse/pull/36167) ([Maksim Kita](https://github.com/kitaisreal)).
+* Experimental feature: Fix insertion of complex JSONs with nested arrays to columns of type `Object`. [#36077](https://github.com/ClickHouse/ClickHouse/pull/36077) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix ALTER DROP COLUMN of nested column with compact parts (i.e. `ALTER TABLE x DROP COLUMN n`, when there is column `n.d`). [#35797](https://github.com/ClickHouse/ClickHouse/pull/35797) ([Azat Khuzhin](https://github.com/azat)).
+* Fix substring function range error length when `offset` and `length` is negative constant and `s` is not constant. [#33861](https://github.com/ClickHouse/ClickHouse/pull/33861) ([RogerYK](https://github.com/RogerYK)).
+
+
+### <a id="224"></a> ClickHouse release 22.4, 2022-04-19
+
+#### Backward Incompatible Change
+
+* Do not allow SETTINGS after FORMAT for INSERT queries (there is compatibility setting `parser_settings_after_format_compact` to accept such queries, but it is turned OFF by default). [#35883](https://github.com/ClickHouse/ClickHouse/pull/35883) ([Azat Khuzhin](https://github.com/azat)).
+* Function `yandexConsistentHash` (consistent hashing algorithm by Konstantin "kostik" Oblakov) is renamed to `kostikConsistentHash`. The old name is left as an alias for compatibility. Although this change is backward compatible, we may remove the alias in subsequent releases, that's why it's recommended to update the usages of this function in your apps. [#35553](https://github.com/ClickHouse/ClickHouse/pull/35553) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+
+#### New Feature
+
+* Added INTERPOLATE extension to the ORDER BY ... WITH FILL. Closes [#34903](https://github.com/ClickHouse/ClickHouse/issues/34903). [#35349](https://github.com/ClickHouse/ClickHouse/pull/35349) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Profiling on Processors level (under `log_processors_profiles` setting, ClickHouse will write time that processor spent during execution/waiting for data to `system.processors_profile_log` table). [#34355](https://github.com/ClickHouse/ClickHouse/pull/34355) ([Azat Khuzhin](https://github.com/azat)).
+* Added functions makeDate(year, month, day), makeDate32(year, month, day). [#35628](https://github.com/ClickHouse/ClickHouse/pull/35628) ([Alexander Gololobov](https://github.com/davenger)). Implementation of makeDateTime() and makeDateTIme64(). [#35934](https://github.com/ClickHouse/ClickHouse/pull/35934) ([Alexander Gololobov](https://github.com/davenger)).
+* Support new type of quota `WRITTEN BYTES` to limit amount of written bytes during insert queries. [#35736](https://github.com/ClickHouse/ClickHouse/pull/35736) ([Anton Popov](https://github.com/CurtizJ)).
+* Added function `flattenTuple`. It receives nested named `Tuple` as an argument and returns a flatten `Tuple` which elements are the paths from the original `Tuple`. E.g.: `Tuple(a Int, Tuple(b Int, c Int)) -> Tuple(a Int, b Int, c Int)`. `flattenTuple` can be used to select all paths from type `Object` as separate columns. [#35690](https://github.com/ClickHouse/ClickHouse/pull/35690) ([Anton Popov](https://github.com/CurtizJ)).
+* Added functions `arrayFirstOrNull`, `arrayLastOrNull`. Closes [#35238](https://github.com/ClickHouse/ClickHouse/issues/35238). [#35414](https://github.com/ClickHouse/ClickHouse/pull/35414) ([Maksim Kita](https://github.com/kitaisreal)).
+* Added functions `minSampleSizeContinous` and `minSampleSizeConversion`. Author [achimbab](https://github.com/achimbab). [#35360](https://github.com/ClickHouse/ClickHouse/pull/35360) ([Maksim Kita](https://github.com/kitaisreal)).
+* New functions minSampleSizeContinous and minSampleSizeConversion. [#34354](https://github.com/ClickHouse/ClickHouse/pull/34354) ([achimbab](https://github.com/achimbab)).
+* Introduce format `ProtobufList` (all records as repeated messages in out Protobuf). Closes [#16436](https://github.com/ClickHouse/ClickHouse/issues/16436). [#35152](https://github.com/ClickHouse/ClickHouse/pull/35152) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Add `h3PointDistM`, `h3PointDistKm`, `h3PointDistRads`, `h3GetRes0Indexes`, `h3GetPentagonIndexes` functions. [#34568](https://github.com/ClickHouse/ClickHouse/pull/34568) ([Bharat Nallan](https://github.com/bharatnc)).
+* Add `toLastDayOfMonth` function which rounds up a date or date with time to the last day of the month. [#33501](https://github.com/ClickHouse/ClickHouse/issues/33501). [#34394](https://github.com/ClickHouse/ClickHouse/pull/34394) ([Habibullah Oladepo](https://github.com/holadepo)).
+* Added load balancing setting for \[Zoo\]Keeper client. Closes [#29617](https://github.com/ClickHouse/ClickHouse/issues/29617). [#30325](https://github.com/ClickHouse/ClickHouse/pull/30325) ([小路](https://github.com/nicelulu)).
+* Add a new kind of row policies named `simple`. Before this PR we had two kinds or row policies: `permissive` and `restrictive`. A `simple` row policy adds a new filter on a table without any side-effects like it was for permissive and restrictive policies. [#35345](https://github.com/ClickHouse/ClickHouse/pull/35345) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Added an ability to specify cluster secret in replicated database. [#35333](https://github.com/ClickHouse/ClickHouse/pull/35333) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Added sanity checks on server startup (available memory and disk space, max thread count, etc). [#34566](https://github.com/ClickHouse/ClickHouse/pull/34566) ([Sergei Trifonov](https://github.com/serxa)).
+* INTERVAL improvement - can be used with `[MILLI|MICRO|NANO]SECOND`. Added `toStartOf[Milli|Micro|Nano]second()` functions. Added `[add|subtract][Milli|Micro|Nano]seconds()`. [#34353](https://github.com/ClickHouse/ClickHouse/pull/34353) ([Andrey Zvonov](https://github.com/zvonand)).
+
+#### Experimental Feature
+
+* Added support for transactions for simple `MergeTree` tables. This feature is highly experimental and not recommended for production. Part of [#22086](https://github.com/ClickHouse/ClickHouse/issues/22086). [#24258](https://github.com/ClickHouse/ClickHouse/pull/24258) ([tavplubix](https://github.com/tavplubix)).
+* Support schema inference for type `Object` in format `JSONEachRow`. Allow to convert columns of type `Map` to columns of type `Object`. [#35629](https://github.com/ClickHouse/ClickHouse/pull/35629) ([Anton Popov](https://github.com/CurtizJ)).
+* Allow to write remote FS cache on all write operations. Add `system.remote_filesystem_cache` table. Add `drop remote filesystem cache` query. Add introspection for s3 metadata with `system.remote_data_paths` table. Closes [#34021](https://github.com/ClickHouse/ClickHouse/issues/34021). Add cache option for merges by adding mode `read_from_filesystem_cache_if_exists_otherwise_bypass_cache` (turned on by default for merges and can also be turned on by query setting with the same name). Rename cache related settings (`remote_fs_enable_cache -> enable_filesystem_cache`, etc). [#35475](https://github.com/ClickHouse/ClickHouse/pull/35475) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* An option to store parts metadata in RocksDB. Speed up parts loading process of MergeTree to accelerate starting up of clickhouse-server. With this improvement, clickhouse-server was able to decrease starting up time from 75 minutes to 20 seconds, with 700k mergetree parts. [#32928](https://github.com/ClickHouse/ClickHouse/pull/32928) ([李扬](https://github.com/taiyang-li)).
+
+#### Performance Improvement
+
+* A new query plan optimization. Evaluate functions after `ORDER BY` when possible. As an example, for a query `SELECT sipHash64(number) FROM numbers(1e8) ORDER BY number LIMIT 5`, function `sipHash64` would be evaluated after `ORDER BY` and `LIMIT`, which gives ~20x speed up. [#35623](https://github.com/ClickHouse/ClickHouse/pull/35623) ([Nikita Taranov](https://github.com/nickitat)).
+* Sizes of hash tables used during aggregation now collected and used in later queries to avoid hash tables resizes. [#33439](https://github.com/ClickHouse/ClickHouse/pull/33439) ([Nikita Taranov](https://github.com/nickitat)).
+* Improvement for hasAll function using SIMD instructions (SSE and AVX2). [#27653](https://github.com/ClickHouse/ClickHouse/pull/27653) ([youennL-cs](https://github.com/youennL-cs)). [#35723](https://github.com/ClickHouse/ClickHouse/pull/35723) ([Maksim Kita](https://github.com/kitaisreal)).
+* Multiple changes to improve ASOF JOIN performance (1.2 - 1.6x as fast). It also adds support to use big integers. [#34733](https://github.com/ClickHouse/ClickHouse/pull/34733) ([Raúl Marín](https://github.com/Algunenano)).
+* Improve performance of ASOF JOIN if key is native integer. [#35525](https://github.com/ClickHouse/ClickHouse/pull/35525) ([Maksim Kita](https://github.com/kitaisreal)).
+* Parallelization of multipart upload into S3 storage. [#35343](https://github.com/ClickHouse/ClickHouse/pull/35343) ([Sergei Trifonov](https://github.com/serxa)).
+* URL storage engine now downloads multiple chunks in parallel if the endpoint supports HTTP Range. Two additional settings were added, `max_download_threads` and `max_download_buffer_size`, which control maximum number of threads a single query can use to download the file and the maximum number of bytes each thread can process. [#35150](https://github.com/ClickHouse/ClickHouse/pull/35150) ([Antonio Andelic](https://github.com/antonio2368)).
+* Use multiple threads to download objects from S3. Downloading is controllable using `max_download_threads` and `max_download_buffer_size` settings. [#35571](https://github.com/ClickHouse/ClickHouse/pull/35571) ([Antonio Andelic](https://github.com/antonio2368)).
+* Narrow mutex scope when interacting with HDFS. Related to [#35292](https://github.com/ClickHouse/ClickHouse/issues/35292). [#35646](https://github.com/ClickHouse/ClickHouse/pull/35646) ([shuchaome](https://github.com/shuchaome)).
+* Require mutations for per-table TTL only when it had been changed. [#35953](https://github.com/ClickHouse/ClickHouse/pull/35953) ([Azat Khuzhin](https://github.com/azat)).
+
+#### Improvement
+
+* Multiple improvements for schema inference. Use some tweaks and heuristics to determine numbers, strings, arrays, tuples and maps in CSV, TSV and TSVRaw data formats. Add setting `input_format_csv_use_best_effort_in_schema_inference` for CSV format that enables/disables using these heuristics, if it's disabled, we treat everything as string. Add similar setting `input_format_tsv_use_best_effort_in_schema_inference` for TSV/TSVRaw format. These settings are enabled by default. - Add Maps support for schema inference in Values format. - Fix possible segfault in schema inference in Values format. - Allow to skip columns with unsupported types in Arrow/ORC/Parquet formats. Add corresponding settings for it: `input_format_{parquet|orc|arrow}_skip_columns_with_unsupported_types_in_schema_inference`. These settings are disabled by default. - Allow to convert a column with type Null to a Nullable column with all NULL values in Arrow/Parquet formats. - Allow to specify column names in schema inference via setting `column_names_for_schema_inference` for formats that don't contain column names (like CSV, TSV, JSONCompactEachRow, etc) - Fix schema inference in ORC/Arrow/Parquet formats in terms of working with Nullable columns. Previously all inferred types were not Nullable and it blocked reading Nullable columns from data, now it's fixed and all inferred types are always Nullable (because we cannot understand that column is Nullable or not by reading the schema). - Fix schema inference in Template format with CSV escaping rules. [#35582](https://github.com/ClickHouse/ClickHouse/pull/35582) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add parallel parsing and schema inference for format `JSONAsObject`. [#35592](https://github.com/ClickHouse/ClickHouse/pull/35592) ([Anton Popov](https://github.com/CurtizJ)).
+* Added a support for automatic schema inference to `s3Cluster` table function. Synced the signatures of `s3 ` and `s3Cluster`. [#35544](https://github.com/ClickHouse/ClickHouse/pull/35544) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Added support for schema inference for `hdfsCluster`. [#35602](https://github.com/ClickHouse/ClickHouse/pull/35602) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Add new setting `input_format_json_read_bools_as_numbers` that allows to infer and parse bools as numbers in JSON input formats. It's enabled by default. Suggested by @alexey-milovidov. [#35735](https://github.com/ClickHouse/ClickHouse/pull/35735) ([Kruglov Pavel](https://github.com/Avogar)).
+* Improve columns ordering in schema inference for formats TSKV and JSONEachRow, closes [#35640](https://github.com/ClickHouse/ClickHouse/issues/35640). Don't stop schema inference when reading empty row in schema inference for formats TSKV and JSONEachRow. [#35724](https://github.com/ClickHouse/ClickHouse/pull/35724) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add settings `input_format_orc_case_insensitive_column_matching`, `input_format_arrow_case_insensitive_column_matching`, and `input_format_parquet_case_insensitive_column_matching` which allows ClickHouse to use case insensitive matching of columns while reading data from ORC, Arrow or Parquet files. [#35459](https://github.com/ClickHouse/ClickHouse/pull/35459) ([Antonio Andelic](https://github.com/antonio2368)).
+* Added `is_secure` column to `system.query_log` which denotes if the client is using a secure connection over TCP or HTTP. [#35705](https://github.com/ClickHouse/ClickHouse/pull/35705) ([Antonio Andelic](https://github.com/antonio2368)).
+* Now `kafka_num_consumers` can be bigger than amount of physical cores in case of low resource machine (less than 16 cores). [#35926](https://github.com/ClickHouse/ClickHouse/pull/35926) ([alesapin](https://github.com/alesapin)).
+* Add some basic metrics to monitor engine=Kafka tables. [#35916](https://github.com/ClickHouse/ClickHouse/pull/35916) ([filimonov](https://github.com/filimonov)).
+* Now it's not allowed to `ALTER TABLE ... RESET SETTING` for non-existing settings for MergeTree engines family. Fixes [#35816](https://github.com/ClickHouse/ClickHouse/issues/35816). [#35884](https://github.com/ClickHouse/ClickHouse/pull/35884) ([alesapin](https://github.com/alesapin)).
+* Now some `ALTER MODIFY COLUMN` queries for `Arrays` and `Nullable` types can be done at metadata level without mutations. For example, alter from `Array(Enum8('Option1'=1))` to `Array(Enum8('Option1'=1, 'Option2'=2))`. [#35882](https://github.com/ClickHouse/ClickHouse/pull/35882) ([alesapin](https://github.com/alesapin)).
+* Added an animation to the hourglass icon to indicate to the user that a query is running. [#35860](https://github.com/ClickHouse/ClickHouse/pull/35860) ([peledni](https://github.com/peledni)).
+* support ALTER TABLE t DETACH PARTITION (ALL). [#35794](https://github.com/ClickHouse/ClickHouse/pull/35794) ([awakeljw](https://github.com/awakeljw)).
+* Improve projection analysis to optimize trivial queries such as `count()`. [#35788](https://github.com/ClickHouse/ClickHouse/pull/35788) ([Amos Bird](https://github.com/amosbird)).
+* Support schema inference for insert select with using `input` table function. Get schema from insertion table instead of inferring it from the data in case of insert select from table functions that support schema inference. Closes [#35639](https://github.com/ClickHouse/ClickHouse/issues/35639). [#35760](https://github.com/ClickHouse/ClickHouse/pull/35760) ([Kruglov Pavel](https://github.com/Avogar)).
+* Respect `remote_url_allow_hosts` for Hive tables. [#35743](https://github.com/ClickHouse/ClickHouse/pull/35743) ([李扬](https://github.com/taiyang-li)).
+* Implement `send_logs_level` for clickhouse-local. Closes [#35653](https://github.com/ClickHouse/ClickHouse/issues/35653). [#35716](https://github.com/ClickHouse/ClickHouse/pull/35716) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Closes [#35641](https://github.com/ClickHouse/ClickHouse/issues/35641) Allow `EPHEMERAL` columns without explicit default expression. [#35706](https://github.com/ClickHouse/ClickHouse/pull/35706) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Add profile event counter `AsyncInsertBytes` about size of async INSERTs. [#35644](https://github.com/ClickHouse/ClickHouse/pull/35644) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Improve the pipeline description for JOIN. [#35612](https://github.com/ClickHouse/ClickHouse/pull/35612) ([何李夫](https://github.com/helifu)).
+* Deduce absolute hdfs config path. [#35572](https://github.com/ClickHouse/ClickHouse/pull/35572) ([李扬](https://github.com/taiyang-li)).
+* Improve pasting performance and compatibility of clickhouse-client. This helps [#35501](https://github.com/ClickHouse/ClickHouse/issues/35501). [#35541](https://github.com/ClickHouse/ClickHouse/pull/35541) ([Amos Bird](https://github.com/amosbird)).
+* It was possible to get stack overflow in distributed queries if one of the settings `async_socket_for_remote` and `use_hedged_requests` is enabled while parsing very deeply nested data type (at least in debug build). Closes [#35509](https://github.com/ClickHouse/ClickHouse/issues/35509). [#35524](https://github.com/ClickHouse/ClickHouse/pull/35524) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add sizes of subcolumns to `system.parts_columns` table. [#35488](https://github.com/ClickHouse/ClickHouse/pull/35488) ([Anton Popov](https://github.com/CurtizJ)).
+* Add explicit table info to the scan node of query plan and pipeline. [#35460](https://github.com/ClickHouse/ClickHouse/pull/35460) ([何李夫](https://github.com/helifu)).
+* Allow server to bind to low-numbered ports (e.g. 443). ClickHouse installation script will set `cap_net_bind_service` to the binary file. [#35451](https://github.com/ClickHouse/ClickHouse/pull/35451) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix INSERT INTO table FROM INFILE: it did not display the progress bar. [#35429](https://github.com/ClickHouse/ClickHouse/pull/35429) ([xiedeyantu](https://github.com/xiedeyantu)).
+* Add arguments `--user`, `--password`, `--host`, `--port` for `clickhouse-diagnostics` tool. [#35422](https://github.com/ClickHouse/ClickHouse/pull/35422) ([李扬](https://github.com/taiyang-li)).
+* Support uuid for Postgres engines. Closes [#35384](https://github.com/ClickHouse/ClickHouse/issues/35384). [#35403](https://github.com/ClickHouse/ClickHouse/pull/35403) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* For table function `s3cluster` or `HDFSCluster` or `hive`, we can't get right `AccessType` by `StorageFactory::instance().getSourceAccessType(getStorageTypeName())`. This pr fix it. [#35365](https://github.com/ClickHouse/ClickHouse/pull/35365) ([李扬](https://github.com/taiyang-li)).
+* Remove `--testmode` option for clickhouse-client, enable it unconditionally. [#35354](https://github.com/ClickHouse/ClickHouse/pull/35354) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Don't allow `wchc` operation (four letter command) for clickhouse-keeper. [#35320](https://github.com/ClickHouse/ClickHouse/pull/35320) ([zhangyuli1](https://github.com/zhangyuli1)).
+* Add function `getTypeSerializationStreams`. For a specified type (which is detected from column), it returns an array with all the serialization substream paths. This function is useful mainly for developers. [#35290](https://github.com/ClickHouse/ClickHouse/pull/35290) ([李扬](https://github.com/taiyang-li)).
+* If `port` is not specified in cluster configuration, default server port will be used. This closes [#34769](https://github.com/ClickHouse/ClickHouse/issues/34769). [#34772](https://github.com/ClickHouse/ClickHouse/pull/34772) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Use `minmax` index for orc/parquet file in Hive Engine. Related PR: https://github.com/ClickHouse/arrow/pull/10. [#34631](https://github.com/ClickHouse/ClickHouse/pull/34631) ([李扬](https://github.com/taiyang-li)).
+* System log tables now allow to specify COMMENT in ENGINE declaration. Closes [#33768](https://github.com/ClickHouse/ClickHouse/issues/33768). [#34536](https://github.com/ClickHouse/ClickHouse/pull/34536) ([Maksim Kita](https://github.com/kitaisreal)).
+* Proper support of setting `max_rows_to_read` in case of reading in order of sorting key and specified limit. Previously the exception `Limit for rows or bytes to read exceeded` could be thrown even if query actually requires to read less amount of rows. [#33230](https://github.com/ClickHouse/ClickHouse/pull/33230) ([Anton Popov](https://github.com/CurtizJ)).
+* Respect only quota & period from cgroups, ignore shares (which are not really limit the number of the cores which can be used). [#35815](https://github.com/ClickHouse/ClickHouse/pull/35815) ([filimonov](https://github.com/filimonov)).
+
+#### Build/Testing/Packaging Improvement
+
+* Add next batch of randomization settings in functional tests. [#35047](https://github.com/ClickHouse/ClickHouse/pull/35047) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add backward compatibility check in stress test. Closes [#25088](https://github.com/ClickHouse/ClickHouse/issues/25088). [#27928](https://github.com/ClickHouse/ClickHouse/pull/27928) ([Kruglov Pavel](https://github.com/Avogar)).
+* Migrate package building to `nfpm` - Deprecate `release` script in favor of `packages/build` - Build everything in clickhouse/binary-builder image (cleanup: clickhouse/deb-builder) - Add symbol stripping to cmake (todo: use $prefix/lib/$bin_dir/clickhouse/$binary.debug) - Fix issue with DWARF symbols - Add Alpine APK packages - Rename `alien` to `additional_pkgs`. [#33664](https://github.com/ClickHouse/ClickHouse/pull/33664) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add a night scan and upload for Coverity. [#34895](https://github.com/ClickHouse/ClickHouse/pull/34895) ([Boris Kuschel](https://github.com/bkuschel)).
+* A dedicated small package for `clickhouse-keeper`. [#35308](https://github.com/ClickHouse/ClickHouse/pull/35308) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Running with podman was failing: it complains about specifying the same volume twice. [#35978](https://github.com/ClickHouse/ClickHouse/pull/35978) ([Roman Nikonov](https://github.com/nic11)).
+* Minor improvement in contrib/krb5 build configuration. [#35832](https://github.com/ClickHouse/ClickHouse/pull/35832) ([Anton Kozlov](https://github.com/tonickkozlov)).
+* Add a label to recognize a building task for every image. [#35583](https://github.com/ClickHouse/ClickHouse/pull/35583) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Apply `black` formatter to python code and add a per-commit check. [#35466](https://github.com/ClickHouse/ClickHouse/pull/35466) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Redo alpine image to use clean Dockerfile. Create a script in tests/ci to build both ubuntu and alpine images. Add clickhouse-keeper image (cc @nikitamikhaylov). Add build check to PullRequestCI. Add a job to a ReleaseCI. Add a job to MasterCI to build and push `clickhouse/clickhouse-server:head` and `clickhouse/clickhouse-keeper:head` images for each merged PR. [#35211](https://github.com/ClickHouse/ClickHouse/pull/35211) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix stress-test report in CI, now we upload the runlog with information about started stress tests only once. [#35093](https://github.com/ClickHouse/ClickHouse/pull/35093) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Switch to libcxx / libcxxabi from LLVM 14. [#34906](https://github.com/ClickHouse/ClickHouse/pull/34906) ([Raúl Marín](https://github.com/Algunenano)).
+* Update unixodbc to mitigate CVE-2018-7485. Note: this CVE is not relevant for ClickHouse as it implements its own isolation layer for ODBC. [#35943](https://github.com/ClickHouse/ClickHouse/pull/35943) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix
+
+* Added settings `input_format_ipv4_default_on_conversion_error`, `input_format_ipv6_default_on_conversion_error` to allow insert of invalid ip address values as default into tables. Closes [#35726](https://github.com/ClickHouse/ClickHouse/issues/35726). [#35733](https://github.com/ClickHouse/ClickHouse/pull/35733) ([Maksim Kita](https://github.com/kitaisreal)).
+* Avoid erasing columns from a block if it doesn't exist while reading data from Hive. [#35393](https://github.com/ClickHouse/ClickHouse/pull/35393) ([lgbo](https://github.com/lgbo-ustc)).
+* Add type checking when creating materialized view. Close: [#23684](https://github.com/ClickHouse/ClickHouse/issues/23684). [#24896](https://github.com/ClickHouse/ClickHouse/pull/24896) ([hexiaoting](https://github.com/hexiaoting)).
+* Fix formatting of INSERT INFILE queries (missing quotes). [#35886](https://github.com/ClickHouse/ClickHouse/pull/35886) ([Azat Khuzhin](https://github.com/azat)).
+* Disable `session_log` because memory safety issue has been found by fuzzing. See [#35714](https://github.com/ClickHouse/ClickHouse/issues/35714). [#35873](https://github.com/ClickHouse/ClickHouse/pull/35873) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Avoid processing per-column TTL multiple times. [#35820](https://github.com/ClickHouse/ClickHouse/pull/35820) ([Azat Khuzhin](https://github.com/azat)).
+* Fix inserts to columns of type `Object` in case when there is data related to several partitions in insert query. [#35806](https://github.com/ClickHouse/ClickHouse/pull/35806) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix bug in indexes of not presented columns in -WithNames formats that led to error `INCORRECT_NUMBER_OF_COLUMNS ` when the number of columns is more than 256. Closes [#35793](https://github.com/ClickHouse/ClickHouse/issues/35793). [#35803](https://github.com/ClickHouse/ClickHouse/pull/35803) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fixes [#35751](https://github.com/ClickHouse/ClickHouse/issues/35751). [#35799](https://github.com/ClickHouse/ClickHouse/pull/35799) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Fix for reading from HDFS in Snappy format. [#35771](https://github.com/ClickHouse/ClickHouse/pull/35771) ([shuchaome](https://github.com/shuchaome)).
+* Fix bug in conversion from custom types to string that could lead to segfault or unexpected error messages. Closes [#35752](https://github.com/ClickHouse/ClickHouse/issues/35752). [#35755](https://github.com/ClickHouse/ClickHouse/pull/35755) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix any/all (subquery) implementation. Closes [#35489](https://github.com/ClickHouse/ClickHouse/issues/35489). [#35727](https://github.com/ClickHouse/ClickHouse/pull/35727) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix dropping non-empty database in clickhouse-local. Closes [#35692](https://github.com/ClickHouse/ClickHouse/issues/35692). [#35711](https://github.com/ClickHouse/ClickHouse/pull/35711) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix bug in creating materialized view with subquery after server restart. Materialized view was not getting updated after inserts into underlying table after server restart. Closes [#35511](https://github.com/ClickHouse/ClickHouse/issues/35511). [#35691](https://github.com/ClickHouse/ClickHouse/pull/35691) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix possible `Can't adjust last granule` exception while reading subcolumns of experimental type `Object`. [#35687](https://github.com/ClickHouse/ClickHouse/pull/35687) ([Anton Popov](https://github.com/CurtizJ)).
+* Enable build with JIT compilation by default. [#35683](https://github.com/ClickHouse/ClickHouse/pull/35683) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix possible loss of subcolumns in experimental type `Object`. [#35682](https://github.com/ClickHouse/ClickHouse/pull/35682) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix check ASOF JOIN key nullability, close [#35565](https://github.com/ClickHouse/ClickHouse/issues/35565). [#35674](https://github.com/ClickHouse/ClickHouse/pull/35674) ([Vladimir C](https://github.com/vdimir)).
+* Fix part checking logic for parts with projections. Error happened when projection and main part had different types. This is similar to https://github.com/ClickHouse/ClickHouse/pull/33774 . The bug is addressed by @caoyang10. [#35667](https://github.com/ClickHouse/ClickHouse/pull/35667) ([Amos Bird](https://github.com/amosbird)).
+* Fix server crash when large number of arguments are passed into `format` function. Please refer to the test file and see how to reproduce the crash. [#35651](https://github.com/ClickHouse/ClickHouse/pull/35651) ([Amos Bird](https://github.com/amosbird)).
+* Fix usage of quotas with asynchronous inserts. [#35645](https://github.com/ClickHouse/ClickHouse/pull/35645) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix positional arguments with aliases. Closes [#35600](https://github.com/ClickHouse/ClickHouse/issues/35600). [#35620](https://github.com/ClickHouse/ClickHouse/pull/35620) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Check `remote_url_allow_hosts` before schema inference in URL engine Closes [#35064](https://github.com/ClickHouse/ClickHouse/issues/35064). [#35619](https://github.com/ClickHouse/ClickHouse/pull/35619) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix `HashJoin` when columns with `LowCardinality` type are used. This closes [#35548](https://github.com/ClickHouse/ClickHouse/issues/35548). [#35616](https://github.com/ClickHouse/ClickHouse/pull/35616) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix possible segfault in MaterializedPostgreSQL which happened if exception occurred when data, collected in memory, was synced into underlying tables. Closes [#35611](https://github.com/ClickHouse/ClickHouse/issues/35611). [#35614](https://github.com/ClickHouse/ClickHouse/pull/35614) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Setting `database_atomic_wait_for_drop_and_detach_synchronously` worked incorrectly for `ATTACH TABLE` query when previously detached table is still in use, It's fixed. [#35594](https://github.com/ClickHouse/ClickHouse/pull/35594) ([tavplubix](https://github.com/tavplubix)).
+* Fix HTTP headers with named collections, add compression_method. Closes [#35273](https://github.com/ClickHouse/ClickHouse/issues/35273). Closes [#35269](https://github.com/ClickHouse/ClickHouse/issues/35269). [#35593](https://github.com/ClickHouse/ClickHouse/pull/35593) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix s3 engine getting virtual columns. Closes [#35411](https://github.com/ClickHouse/ClickHouse/issues/35411). [#35586](https://github.com/ClickHouse/ClickHouse/pull/35586) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fixed return type deduction for `caseWithExpression`. The type of the ELSE branch is now correctly taken into account. [#35576](https://github.com/ClickHouse/ClickHouse/pull/35576) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix parsing of IPv6 addresses longer than 39 characters. Closes [#34022](https://github.com/ClickHouse/ClickHouse/issues/34022). [#35539](https://github.com/ClickHouse/ClickHouse/pull/35539) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix cast into IPv4, IPv6 address in IN section. Fixes [#35528](https://github.com/ClickHouse/ClickHouse/issues/35528). [#35534](https://github.com/ClickHouse/ClickHouse/pull/35534) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix crash during short circuit function evaluation when one of arguments is nullable constant. Closes [#35497](https://github.com/ClickHouse/ClickHouse/issues/35497). Closes [#35496](https://github.com/ClickHouse/ClickHouse/issues/35496). [#35502](https://github.com/ClickHouse/ClickHouse/pull/35502) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix crash for function `throwIf` with constant arguments. [#35500](https://github.com/ClickHouse/ClickHouse/pull/35500) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix bug in Keeper which can lead to unstable client connections. Introduced in [#35031](https://github.com/ClickHouse/ClickHouse/issues/35031). [#35498](https://github.com/ClickHouse/ClickHouse/pull/35498) ([alesapin](https://github.com/alesapin)).
+* Fix bug in function `if` when resulting column type differs with resulting data type that led to logical errors like `Logical error: 'Bad cast from type DB::ColumnVector<int> to DB::ColumnVector<long>'.`. Closes [#35367](https://github.com/ClickHouse/ClickHouse/issues/35367). [#35476](https://github.com/ClickHouse/ClickHouse/pull/35476) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix excessive logging when using S3 as backend for MergeTree or as separate table engine/function. Fixes [#30559](https://github.com/ClickHouse/ClickHouse/issues/30559). [#35434](https://github.com/ClickHouse/ClickHouse/pull/35434) ([alesapin](https://github.com/alesapin)).
+* Now merges executed with zero copy replication (experimental) will not spam logs with message `Found parts with the same min block and with the same max block as the missing part _ on replica _. Hoping that it will eventually appear as a result of a merge.`. [#35430](https://github.com/ClickHouse/ClickHouse/pull/35430) ([alesapin](https://github.com/alesapin)).
+* Skip possible exception if empty chunks appear in GroupingAggregatedTransform. [#35417](https://github.com/ClickHouse/ClickHouse/pull/35417) ([Nikita Taranov](https://github.com/nickitat)).
+* Fix working with columns that are not needed in query in Arrow/Parquet/ORC formats, it prevents possible errors like `Unsupported <format> type <type> of an input column <column_name>` when file contains column with unsupported type and we don't use it in query. [#35406](https://github.com/ClickHouse/ClickHouse/pull/35406) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix for local cache for remote filesystem (experimental feature) for high concurrency on corner cases. [#35381](https://github.com/ClickHouse/ClickHouse/pull/35381) ([Kseniia Sumarokova](https://github.com/kssenii)). Fix possible deadlock in cache. [#35378](https://github.com/ClickHouse/ClickHouse/pull/35378) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix partition pruning in case of comparison with constant in `WHERE`. If column and constant had different types, overflow was possible. Query could return an incorrect empty result. This fixes [#35304](https://github.com/ClickHouse/ClickHouse/issues/35304). [#35334](https://github.com/ClickHouse/ClickHouse/pull/35334) ([Amos Bird](https://github.com/amosbird)).
+* Fix schema inference for TSKV format while using small max_read_buffer_size. [#35332](https://github.com/ClickHouse/ClickHouse/pull/35332) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix mutations in tables with enabled sparse columns. [#35284](https://github.com/ClickHouse/ClickHouse/pull/35284) ([Anton Popov](https://github.com/CurtizJ)).
+* Do not delay final part writing by default (fixes possible `Memory limit exceeded` during `INSERT` by adding `max_insert_delayed_streams_for_parallel_write` with default to 1000 for writes to s3 and disabled as before otherwise). [#34780](https://github.com/ClickHouse/ClickHouse/pull/34780) ([Azat Khuzhin](https://github.com/azat)).
+
 
 ## <a id="223"></a> ClickHouse release v22.3-lts, 2022-03-17
 
@@ -11,6 +326,7 @@
 
 * Make `arrayCompact` function behave as other higher-order functions: perform compaction not of lambda function results but on the original array. If you're using nontrivial lambda functions in arrayCompact you may restore old behaviour by wrapping `arrayCompact` arguments into `arrayMap`. Closes [#34010](https://github.com/ClickHouse/ClickHouse/issues/34010) [#18535](https://github.com/ClickHouse/ClickHouse/issues/18535) [#14778](https://github.com/ClickHouse/ClickHouse/issues/14778). [#34795](https://github.com/ClickHouse/ClickHouse/pull/34795) ([Alexandre Snarskii](https://github.com/snar)).
 * Change implementation specific behavior on overflow of function `toDatetime`. It will be saturated to the nearest min/max supported instant of datetime instead of wraparound. This change is highlighted as "backward incompatible" because someone may unintentionally rely on the old behavior. [#32898](https://github.com/ClickHouse/ClickHouse/pull/32898) ([HaiBo Li](https://github.com/marising)).
+* Make function `cast(value, 'IPv4')`, `cast(value, 'IPv6')` behave same as `toIPv4`, `toIPv6` functions. Changed behavior of incorrect IP address passed into functions `toIPv4`,` toIPv6`,  now if invalid IP address passes into this functions exception will be raised, before this function return default value. Added functions `IPv4StringToNumOrDefault`, `IPv4StringToNumOrNull`, `IPv6StringToNumOrDefault`, `IPv6StringOrNull` `toIPv4OrDefault`, `toIPv4OrNull`, `toIPv6OrDefault`, `toIPv6OrNull`. Functions `IPv4StringToNumOrDefault `, `toIPv4OrDefault `, `toIPv6OrDefault ` should be used if previous logic relied on `IPv4StringToNum`, `toIPv4`, `toIPv6` returning default value for invalid address. Added setting `cast_ipv4_ipv6_default_on_conversion_error`, if this setting enabled, then IP address conversion functions will behave as before. Closes [#22825](https://github.com/ClickHouse/ClickHouse/issues/22825). Closes [#5799](https://github.com/ClickHouse/ClickHouse/issues/5799). Closes [#35156](https://github.com/ClickHouse/ClickHouse/issues/35156). [#35240](https://github.com/ClickHouse/ClickHouse/pull/35240) ([Maksim Kita](https://github.com/kitaisreal)).
 
 #### New Feature
 
@@ -366,7 +682,7 @@
 
 #### Improvement
 
-* Now date time conversion functions that generates time before `1970-01-01 00:00:00` will be saturated to zero instead of overflow. [#29953](https://github.com/ClickHouse/ClickHouse/pull/29953) ([Amos Bird](https://github.com/amosbird)). It also fixes a bug in index analysis if date truncation function would yield result before the Unix epoch. 
+* Now date time conversion functions that generates time before `1970-01-01 00:00:00` will be saturated to zero instead of overflow. [#29953](https://github.com/ClickHouse/ClickHouse/pull/29953) ([Amos Bird](https://github.com/amosbird)). It also fixes a bug in index analysis if date truncation function would yield result before the Unix epoch.
 * Always display resource usage (total CPU usage, total RAM usage and max RAM usage per host) in client. [#33271](https://github.com/ClickHouse/ClickHouse/pull/33271) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Improve `Bool` type serialization and deserialization, check the range of values. [#32984](https://github.com/ClickHouse/ClickHouse/pull/32984) ([Kruglov Pavel](https://github.com/Avogar)).
 * If an invalid setting is defined using the `SET` query or using the query parameters in the HTTP request, error message will contain suggestions that are similar to the invalid setting string (if any exists). [#32946](https://github.com/ClickHouse/ClickHouse/pull/32946) ([Antonio Andelic](https://github.com/antonio2368)).

CMakeLists.txt

@@ -1,32 +1,6 @@
 cmake_minimum_required(VERSION 3.14)
 
-foreach(policy
+project(ClickHouse LANGUAGES C CXX ASM)
-        CMP0023
-        CMP0048 # CMake 3.0
-        CMP0074 # CMake 3.12
-        CMP0077
-        CMP0079
-    )
-    if(POLICY ${policy})
-        cmake_policy(SET ${policy} NEW)
-    endif()
-endforeach()
-
-# set default policy
-foreach(default_policy_var_name
-        # make option() honor normal variables for BUILD_SHARED_LIBS:
-        # - re2
-        # - snappy
-        CMAKE_POLICY_DEFAULT_CMP0077
-        # Google Test from sources uses too old cmake, 2.6.x, and CMP0022 should
-        # set, to avoid using deprecated LINK_INTERFACE_LIBRARIES(_<CONFIG>)? over
-        # INTERFACE_LINK_LIBRARIES.
-        CMAKE_POLICY_DEFAULT_CMP0022
-    )
-    set(${default_policy_var_name} NEW)
-endforeach()
-
-project(ClickHouse)
 
 # If turned off: e.g. when ENABLE_FOO is ON, but FOO tool was not found, the CMake will continue.
 option(FAIL_ON_UNSUPPORTED_OPTIONS_COMBINATION
@@ -39,12 +13,11 @@ else()
     set(RECONFIGURE_MESSAGE_LEVEL WARNING)
 endif()
 
-enable_language(C CXX ASM)
-
 include (cmake/arch.cmake)
 include (cmake/target.cmake)
 include (cmake/tools.cmake)
-include (cmake/analysis.cmake)
+include (cmake/ccache.cmake)
+include (cmake/clang_tidy.cmake)
 include (cmake/git_status.cmake)
 
 # Ignore export() since we don't use it,
@@ -52,7 +25,6 @@ include (cmake/git_status.cmake)
 macro (export)
 endmacro ()
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")
 set(CMAKE_EXPORT_COMPILE_COMMANDS 1) # Write compile_commands.json
 set(CMAKE_LINK_DEPENDS_NO_SHARED 1) # Do not relink all depended targets on .so
 set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Debug;Release;MinSizeRel" CACHE STRING "" FORCE)
@@ -67,8 +39,6 @@ if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/sysroot/README.md")
     message (FATAL_ERROR "Submodules are not initialized. Run\n\tgit submodule update --init --recursive")
 endif ()
 
-include (cmake/ccache.cmake)
-
 # Take care to add prlimit in command line before ccache, or else ccache thinks that
 # prlimit is compiler, and clang++ is its input file, and refuses to work  with
 # multiple inputs, e.g in ccache log:
@@ -161,20 +131,22 @@ add_library(global-libs INTERFACE)
 include (cmake/fuzzer.cmake)
 include (cmake/sanitize.cmake)
 
-if (CMAKE_GENERATOR STREQUAL "Ninja" AND NOT DISABLE_COLORED_BUILD)
+option(ENABLE_COLORED_BUILD "Enable colors in compiler output" ON)
+
+set (CMAKE_COLOR_MAKEFILE ${ENABLE_COLORED_BUILD}) # works only for the makefile generator
+
+if (ENABLE_COLORED_BUILD AND CMAKE_GENERATOR STREQUAL "Ninja")
     # Turn on colored output. https://github.com/ninja-build/ninja/wiki/FAQ
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always")
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-color=always")
+    # ... such manually setting of flags can be removed once CMake supports a variable to
+    # activate colors in *all* build systems: https://gitlab.kitware.com/cmake/cmake/-/issues/15502
 endif ()
 
 include (cmake/check_flags.cmake)
 include (cmake/add_warning.cmake)
 
-set (COMMON_WARNING_FLAGS "${COMMON_WARNING_FLAGS} -Wall")    # -Werror and many more is also added inside cmake/warnings.cmake
-
 if (COMPILER_CLANG)
-    # clang: warning: argument unused during compilation: '-specs=/usr/share/dpkg/no-pie-compile.specs' [-Wunused-command-line-argument]
-    set (COMMON_WARNING_FLAGS "${COMMON_WARNING_FLAGS} -Wno-unused-command-line-argument")
     # generate ranges for fast "addr2line" search
     if (NOT CMAKE_BUILD_TYPE_UC STREQUAL "RELEASE")
         set(COMPILER_FLAGS "${COMPILER_FLAGS} -gdwarf-aranges")
@@ -222,6 +194,12 @@ else ()
     set(NO_WHOLE_ARCHIVE --no-whole-archive)
 endif ()
 
+option(ENABLE_CURL_BUILD "Enable curl, azure, sentry build on by default except MacOS." ON)
+if (OS_DARWIN)
+    # Disable the curl, azure, senry build on MacOS
+    set (ENABLE_CURL_BUILD OFF)
+endif ()
+
 # Ignored if `lld` is used
 option(ADD_GDB_INDEX_FOR_GOLD "Add .gdb-index to resulting binaries for gold linker.")
 
@@ -251,6 +229,11 @@ endif()
 
 option(USE_DEBUG_HELPERS "Enable debug helpers" ${USE_DEBUG_HELPERS})
 option(BUILD_STANDALONE_KEEPER "Build keeper as small standalone binary" OFF)
+if (NOT BUILD_STANDALONE_KEEPER)
+    option(CREATE_KEEPER_SYMLINK "Create symlink for clickhouse-keeper to main server binary" ON)
+else ()
+    option(CREATE_KEEPER_SYMLINK "Create symlink for clickhouse-keeper to main server binary" OFF)
+endif ()
 
 # Create BuildID when using lld. For other linkers it is created by default.
 if (LINKER_NAME MATCHES "lld$")
@@ -261,12 +244,12 @@ endif ()
 # Add a section with the hash of the compiled machine code for integrity checks.
 # Only for official builds, because adding a section can be time consuming (rewrite of several GB).
 # And cross compiled binaries are not supported (since you cannot execute clickhouse hash-binary)
-if (OBJCOPY_PATH AND YANDEX_OFFICIAL_BUILD AND (NOT CMAKE_TOOLCHAIN_FILE))
+if (OBJCOPY_PATH AND CLICKHOUSE_OFFICIAL_BUILD AND (NOT CMAKE_TOOLCHAIN_FILE OR CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-x86_64.cmake$"))
-    set (USE_BINARY_HASH 1)
+    set (USE_BINARY_HASH 1 CACHE STRING "Calculate binary hash and store it in the separate section")
 endif ()
 
 # Allows to build stripped binary in a separate directory
-if (OBJCOPY_PATH AND READELF_PATH)
+if (OBJCOPY_PATH AND STRIP_PATH)
     option(INSTALL_STRIPPED_BINARIES "Build stripped binaries with debug info in separate directory" OFF)
     if (INSTALL_STRIPPED_BINARIES)
         set(STRIPPED_BINARIES_OUTPUT "stripped" CACHE STRING "A separate directory for stripped information")
@@ -294,33 +277,33 @@ include(cmake/cpu_features.cmake)
 # Enable it explicitly.
 set (COMPILER_FLAGS "${COMPILER_FLAGS} -fasynchronous-unwind-tables")
 
-# Reproducible builds
+# Reproducible builds.
-# If turned `ON`, remap file source paths in debug info, predefined preprocessor macros and __builtin_FILE().
+if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG")
-option(ENABLE_BUILD_PATH_MAPPING "Enable remap file source paths in debug info, predefined preprocessor macros and __builtin_FILE(). It's to generate reproducible builds. See https://reproducible-builds.org/docs/build-path" ON)
+    set (ENABLE_BUILD_PATH_MAPPING_DEFAULT OFF)
+else ()
+    set (ENABLE_BUILD_PATH_MAPPING_DEFAULT ON)
+endif ()
+
+option (ENABLE_BUILD_PATH_MAPPING "Enable remapping of file source paths in debug info, predefined preprocessor macros, and __builtin_FILE(). It's used to generate reproducible builds. See https://reproducible-builds.org/docs/build-path" ${ENABLE_BUILD_PATH_MAPPING_DEFAULT})
 
 if (ENABLE_BUILD_PATH_MAPPING)
     set (COMPILER_FLAGS "${COMPILER_FLAGS} -ffile-prefix-map=${CMAKE_SOURCE_DIR}=.")
     set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -ffile-prefix-map=${CMAKE_SOURCE_DIR}=.")
-endif()
-
-if (${CMAKE_VERSION} VERSION_LESS "3.12.4")
-    # CMake < 3.12 doesn't support setting 20 as a C++ standard version.
-    # We will add C++ standard controlling flag in CMAKE_CXX_FLAGS manually for now.
-
-    if (COMPILER_GCC OR COMPILER_CLANG)
-        # to make numeric_limits<__int128> works with GCC
-        set (_CXX_STANDARD "gnu++2a")
-    else ()
-        set (_CXX_STANDARD "c++2a")
-    endif ()
-
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=${_CXX_STANDARD}")
-else ()
-    set (CMAKE_CXX_STANDARD 20)
-    set (CMAKE_CXX_EXTENSIONS ON) # Same as gnu++2a (ON) vs c++2a (OFF): https://cmake.org/cmake/help/latest/prop_tgt/CXX_EXTENSIONS.html
-    set (CMAKE_CXX_STANDARD_REQUIRED ON)
 endif ()
 
+option (ENABLE_BUILD_PROFILING "Enable profiling of build time" OFF)
+if (ENABLE_BUILD_PROFILING)
+     if (COMPILER_CLANG)
+        set (COMPILER_FLAGS "${COMPILER_FLAGS} -ftime-trace")
+     else ()
+        message (${RECONFIGURE_MESSAGE_LEVEL} "Build profiling is only available with CLang")
+     endif ()
+endif ()
+
+set (CMAKE_CXX_STANDARD 20)
+set (CMAKE_CXX_EXTENSIONS ON) # Same as gnu++2a (ON) vs c++2a (OFF): https://cmake.org/cmake/help/latest/prop_tgt/CXX_EXTENSIONS.html
+set (CMAKE_CXX_STANDARD_REQUIRED ON)
+
 set (CMAKE_C_STANDARD 11)
 set (CMAKE_C_EXTENSIONS ON)
 set (CMAKE_C_STANDARD_REQUIRED ON)
@@ -360,15 +343,18 @@ set (COMPILER_FLAGS "${COMPILER_FLAGS}")
 # Our built-in unwinder only supports DWARF version up to 4.
 set (DEBUG_INFO_FLAGS "-g -gdwarf-4")
 
-set (CMAKE_BUILD_COLOR_MAKEFILE          ON)
+set (CMAKE_CXX_FLAGS                     "${CMAKE_CXX_FLAGS} ${COMPILER_FLAGS}")
-set (CMAKE_CXX_FLAGS                     "${CMAKE_CXX_FLAGS} ${COMPILER_FLAGS} ${PLATFORM_EXTRA_CXX_FLAG} ${COMMON_WARNING_FLAGS} ${CXX_WARNING_FLAGS}")
 set (CMAKE_CXX_FLAGS_RELWITHDEBINFO      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3 ${DEBUG_INFO_FLAGS} ${CMAKE_CXX_FLAGS_ADD}")
 set (CMAKE_CXX_FLAGS_DEBUG               "${CMAKE_CXX_FLAGS_DEBUG} -O0 ${DEBUG_INFO_FLAGS} -fno-inline ${CMAKE_CXX_FLAGS_ADD}")
 
-set (CMAKE_C_FLAGS                       "${CMAKE_C_FLAGS} ${COMPILER_FLAGS} ${COMMON_WARNING_FLAGS} ${CMAKE_C_FLAGS_ADD}")
+set (CMAKE_C_FLAGS                       "${CMAKE_C_FLAGS} ${COMPILER_FLAGS} ${CMAKE_C_FLAGS_ADD}")
 set (CMAKE_C_FLAGS_RELWITHDEBINFO        "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3 ${DEBUG_INFO_FLAGS} ${CMAKE_C_FLAGS_ADD}")
 set (CMAKE_C_FLAGS_DEBUG                 "${CMAKE_C_FLAGS_DEBUG} -O0 ${DEBUG_INFO_FLAGS} -fno-inline ${CMAKE_C_FLAGS_ADD}")
 
+set (CMAKE_ASM_FLAGS                     "${CMAKE_ASM_FLAGS} ${COMPILER_FLAGS} ${CMAKE_ASM_FLAGS_ADD}")
+set (CMAKE_ASM_FLAGS_RELWITHDEBINFO      "${CMAKE_ASM_FLAGS_RELWITHDEBINFO} -O3 ${DEBUG_INFO_FLAGS} ${CMAKE_ASM_FLAGS_ADD}")
+set (CMAKE_ASM_FLAGS_DEBUG               "${CMAKE_ASM_FLAGS_DEBUG} -O0 ${DEBUG_INFO_FLAGS} -fno-inline ${CMAKE_ASM_FLAGS_ADD}")
+
 if (COMPILER_CLANG)
     if (OS_DARWIN)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
@@ -406,19 +392,12 @@ if (COMPILER_CLANG)
     endif ()
 
 elseif (ENABLE_THINLTO)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "ThinLTO is only available with CLang")
+    message (${RECONFIGURE_MESSAGE_LEVEL} "ThinLTO is only available with Clang")
 endif ()
 
 # Turns on all external libs like s3, kafka, ODBC, ...
 option(ENABLE_LIBRARIES "Enable all external libraries by default" ON)
 
-if (NOT (OS_LINUX OR OS_DARWIN))
-    # Using system libs can cause a lot of warnings in includes (on macro expansion).
-    option(WERROR "Enable -Werror compiler option" OFF)
-else ()
-    option(WERROR "Enable -Werror compiler option" ON)
-endif ()
-
 # Increase stack size on Musl. We need big stack for our recursive-descend parser.
 if (USE_MUSL)
     set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,stack-size=2097152")
@@ -436,6 +415,13 @@ elseif (OS_FREEBSD)
 endif ()
 link_libraries(global-group)
 
+if (NOT (OS_LINUX OR OS_DARWIN))
+    # Using system libs can cause a lot of warnings in includes (on macro expansion).
+    option(WERROR "Enable -Werror compiler option" OFF)
+else ()
+    option(WERROR "Enable -Werror compiler option" ON)
+endif ()
+
 if (WERROR)
     # Don't pollute CMAKE_CXX_FLAGS with -Werror as it will break some CMake checks.
     # Instead, adopt modern cmake usage requirement.
@@ -444,7 +430,7 @@ endif ()
 
 # Make this extra-checks for correct library dependencies.
 if (OS_LINUX AND NOT SANITIZE)
-    target_link_options(global-group INTERFACE "-Wl,--no-undefined")
+    target_link_options(global-group INTERFACE "LINKER:--no-undefined")
 endif ()
 
 ######################################
@@ -455,7 +441,7 @@ set (CMAKE_POSTFIX_VARIABLE "CMAKE_${CMAKE_BUILD_TYPE_UC}_POSTFIX")
 
 if (USE_STATIC_LIBRARIES)
     set (CMAKE_POSITION_INDEPENDENT_CODE OFF)
-    if (OS_LINUX AND NOT ARCH_ARM)
+    if (OS_LINUX AND NOT ARCH_AARCH64)
         # Slightly more efficient code can be generated
         # It's disabled for ARM because otherwise ClickHouse cannot run on Android.
         set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fno-pie")
@@ -489,8 +475,7 @@ endif ()
 message (STATUS
     "Building for: ${CMAKE_SYSTEM} ${CMAKE_SYSTEM_PROCESSOR} ${CMAKE_LIBRARY_ARCHITECTURE} ;
     USE_STATIC_LIBRARIES=${USE_STATIC_LIBRARIES}
-    SPLIT_SHARED=${SPLIT_SHARED_LIBRARIES}
+    SPLIT_SHARED=${SPLIT_SHARED_LIBRARIES}")
-    CCACHE=${CCACHE_FOUND} ${CCACHE_VERSION}")
 
 include (GNUInstallDirs)
 

PreLoad.cmake

@@ -19,6 +19,33 @@ if (NOT DEFINED ENV{CLION_IDE} AND NOT DEFINED ENV{XCODE_IDE})
     endif ()
 endif()
 
+# Check if environment is polluted.
+if (NOT $ENV{CFLAGS} STREQUAL ""
+    OR NOT $ENV{CXXFLAGS} STREQUAL ""
+    OR NOT $ENV{LDFLAGS} STREQUAL ""
+    OR CMAKE_C_FLAGS OR CMAKE_CXX_FLAGS OR CMAKE_EXE_LINKER_FLAGS OR CMAKE_SHARED_LINKER_FLAGS OR CMAKE_MODULE_LINKER_FLAGS
+    OR CMAKE_C_FLAGS_INIT OR CMAKE_CXX_FLAGS_INIT OR CMAKE_EXE_LINKER_FLAGS_INIT OR CMAKE_SHARED_LINKER_FLAGS_INIT OR CMAKE_MODULE_LINKER_FLAGS_INIT)
+
+    message("CFLAGS: $ENV{CFLAGS}")
+    message("CXXFLAGS: $ENV{CXXFLAGS}")
+    message("LDFLAGS: $ENV{LDFLAGS}")
+    message("CMAKE_C_FLAGS: ${CMAKE_C_FLAGS}")
+    message("CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
+    message("CMAKE_EXE_LINKER_FLAGS: ${CMAKE_EXE_LINKER_FLAGS}")
+    message("CMAKE_SHARED_LINKER_FLAGS: ${CMAKE_SHARED_LINKER_FLAGS}")
+    message("CMAKE_MODULE_LINKER_FLAGS: ${CMAKE_MODULE_LINKER_FLAGS}")
+
+    message(FATAL_ERROR "
+        Some of the variables like CFLAGS, CXXFLAGS, LDFLAGS are not empty.
+        It is not possible to build ClickHouse with custom flags.
+        These variables can be set up by previous invocation of some other build tools.
+        You should cleanup these variables and start over again.
+
+        Run the `env` command to check the details.
+        You will also need to remove the contents of the build directory.
+
+        Note: if you don't like this behavior, you can manually edit the cmake files, but please don't complain to developers.")
+endif()
 
 # Default toolchain - this is needed to avoid dependency on OS files.
 execute_process(COMMAND uname -s OUTPUT_VARIABLE OS)

SECURITY.md

@@ -25,9 +25,11 @@ The following versions of ClickHouse server are currently being supported with s
 | 21.10   | :x: |
 | 21.11   | :x: |
 | 21.12   | :x: |
-| 22.1   | ✅ |
+| 22.1   | :x: |
-| 22.2   | ✅ |
+| 22.2   | :x: |
 | 22.3   | ✅ |
+| 22.4   | ✅ |
+| 22.5   | ✅ |
 
 ## Reporting a Vulnerability
 

base/CMakeLists.txt

@@ -3,9 +3,6 @@ if (USE_CLANG_TIDY)
 endif ()
 
 add_subdirectory (base)
-add_subdirectory (daemon)
-add_subdirectory (loggers)
 add_subdirectory (pcg-random)
 add_subdirectory (widechar_width)
 add_subdirectory (readpassphrase)
-add_subdirectory (bridge)

base/base/CMakeLists.txt

@@ -2,6 +2,7 @@ set (SRCS
     argsToConfig.cpp
     coverage.cpp
     demangle.cpp
+    getAvailableMemoryAmount.cpp
     getFQDNOrHostName.cpp
     getMemoryAmount.cpp
     getPageSize.cpp
@@ -18,6 +19,7 @@ set (SRCS
     errnoToString.cpp
     StringRef.cpp
     safeExit.cpp
+    throwError.cpp
 )
 
 if (ENABLE_REPLXX)

base/base/JSON.cpp

@@ -1,5 +1,5 @@
 #include <string>
-#include <string.h>
+#include <cstring>
 
 #include <Poco/UTF8Encoding.h>
 #include <Poco/NumberParser.h>
@@ -12,7 +12,7 @@
 #define JSON_MAX_DEPTH 100
 
 
-POCO_IMPLEMENT_EXCEPTION(JSONException, Poco::Exception, "JSONException")
+POCO_IMPLEMENT_EXCEPTION(JSONException, Poco::Exception, "JSONException") // NOLINT(cert-err60-cpp, modernize-use-noexcept, hicpp-use-noexcept)
 
 
 /// Прочитать беззнаковое целое в простом формате из не-0-terminated строки.

base/base/LineReader.cpp

@@ -5,7 +5,7 @@
 #include <algorithm>
 
 #include <cassert>
-#include <string.h>
+#include <cstring>
 #include <unistd.h>
 #include <sys/select.h>
 #include <sys/time.h>
@@ -73,7 +73,7 @@ replxx::Replxx::completions_t LineReader::Suggest::getCompletions(const String &
     if (std::string::npos == last_word_pos)
         last_word = prefix;
     else
-        last_word = std::string_view(prefix).substr(last_word_pos + 1, std::string::npos);
+        last_word = std::string_view{prefix}.substr(last_word_pos + 1, std::string::npos);
     /// last_word can be empty.
 
     std::pair<Words::const_iterator, Words::const_iterator> range;

base/base/ReplxxLineReader.cpp

@@ -378,4 +378,4 @@ void ReplxxLineReader::enableBracketedPaste()
 {
     bracketed_paste_enabled = true;
     rx.enable_bracketed_paste();
-};
+}

base/base/StringRef.h

@@ -37,7 +37,8 @@ struct StringRef
     size_t size = 0;
 
     /// Non-constexpr due to reinterpret_cast.
-    template <typename CharT, typename = std::enable_if_t<sizeof(CharT) == 1>>
+    template <typename CharT>
+    requires (sizeof(CharT) == 1)
     StringRef(const CharT * data_, size_t size_) : data(reinterpret_cast<const char *>(data_)), size(size_)
     {
         /// Sanity check for overflowed values.
@@ -51,6 +52,8 @@ struct StringRef
     constexpr StringRef(const char * data_) : StringRef(std::string_view{data_}) {} /// NOLINT
     constexpr StringRef() = default;
 
+    bool empty() const { return size == 0; }
+
     std::string toString() const { return std::string(data, size); }
 
     explicit operator std::string() const { return toString(); }

base/base/defines.h

@@ -105,6 +105,25 @@
 #   define ASAN_POISON_MEMORY_REGION(a, b)
 #endif
 
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+    #if !defined(NDEBUG) || defined(ADDRESS_SANITIZER) || defined(THREAD_SANITIZER) || defined(MEMORY_SANITIZER) || defined(UNDEFINED_BEHAVIOR_SANITIZER)
+        #define ABORT_ON_LOGICAL_ERROR
+    #endif
+#endif
+
+/// chassert(x) is similar to assert(x), but:
+///     - works in builds with sanitizers, not only in debug builds
+///     - tries to print failed assertion into server log
+/// It can be used for all assertions except heavy ones.
+/// Heavy assertions (that run loops or call complex functions) are allowed in debug builds only.
+#if !defined(chassert)
+    #if defined(ABORT_ON_LOGICAL_ERROR)
+        #define chassert(x) static_cast<bool>(x) ? void(0) : abortOnFailedAssertion(#x)
+    #else
+        #define chassert(x) ((void)0)
+    #endif
+#endif
+
 /// A template function for suppressing warnings about unused variables or function results.
 template <typename... Args>
 constexpr void UNUSED(Args &&... args [[maybe_unused]])

base/base/demangle.cpp

@@ -1,6 +1,6 @@
 #include <base/demangle.h>
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <cxxabi.h>
 
 static DemangleResult tryDemangle(const char * name, int & status)

base/base/getAvailableMemoryAmount.cpp

@@ -0,0 +1,44 @@
+#include <stdexcept>
+#include <fstream>
+#include <base/getAvailableMemoryAmount.h>
+#include <base/getPageSize.h>
+
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/param.h>
+#if defined(BSD)
+#include <sys/sysctl.h>
+#include <sys/vmmeter.h>
+#endif
+
+
+uint64_t getAvailableMemoryAmountOrZero()
+{
+#if defined(_SC_PHYS_PAGES) // linux
+    return getPageSize() * sysconf(_SC_PHYS_PAGES);
+#elif defined(__FreeBSD__)
+    struct vmtotal vmt;
+    size_t vmt_size = sizeof(vmt);
+    if (sysctlbyname("vm.vmtotal", &vmt, &vmt_size, NULL, 0) == 0)
+        return getPageSize() * vmt.t_avm;
+    else
+        return 0;
+#else // darwin
+    unsigned int usermem;
+    size_t len = sizeof(usermem);
+    static int mib[2] = { CTL_HW, HW_USERMEM };
+    if (sysctl(mib, 2, &usermem, &len, nullptr, 0) == 0 && len == sizeof(usermem))
+        return usermem;
+    else
+        return 0;
+#endif
+}
+
+
+uint64_t getAvailableMemoryAmount()
+{
+    auto res = getAvailableMemoryAmountOrZero();
+    if (!res)
+        throw std::runtime_error("Cannot determine available memory amount");
+    return res;
+}

base/base/getAvailableMemoryAmount.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#include <cstdint>
+
+/** Returns the size of currently available physical memory (RAM) in bytes.
+  * Returns 0 on unsupported platform or if it cannot determine the size of physical memory.
+  */
+uint64_t getAvailableMemoryAmountOrZero();
+
+/** Throws exception if it cannot determine the size of physical memory.
+  */
+uint64_t getAvailableMemoryAmount();

base/base/mremap.cpp

@@ -3,7 +3,7 @@
 #include <cstddef>
 #include <cstdlib>
 #include <cstring>
-#include <errno.h>
+#include <cerrno>
 
 
 void * mremap_fallback(

base/base/phdr_cache.cpp

@@ -2,7 +2,7 @@
 #pragma clang diagnostic ignored "-Wreserved-identifier"
 #endif
 
-/// This code was based on the code by Fedor Korotkiy (prime@yandex-team.ru) for YT product in Yandex.
+/// This code was based on the code by Fedor Korotkiy https://www.linkedin.com/in/fedor-korotkiy-659a1838/
 
 #include <base/defines.h>
 

base/base/phdr_cache.h

@@ -1,6 +1,6 @@
 #pragma once
 
-/// This code was based on the code by Fedor Korotkiy (prime@yandex-team.ru) for YT product in Yandex.
+/// This code was based on the code by Fedor Korotkiy https://www.linkedin.com/in/fedor-korotkiy-659a1838/
 
 /** Collects all dl_phdr_info items and caches them in a static array.
   * Also rewrites dl_iterate_phdr with a lock-free version which consults the above cache

base/base/preciseExp10.cpp

@@ -169,9 +169,9 @@ obstacle to adoption, that text has been removed.
 
 */
 
-#include <math.h>
+#include <cmath>
-#include <stdint.h>
+#include <cstdint>
-#include <stdio.h>
+#include <cstdio>
 
 double preciseExp10(double x)
 {

base/base/scope_guard.h

@@ -21,10 +21,12 @@ public:
         return *this;
     }
 
-    template <typename G, typename = std::enable_if_t<std::is_convertible_v<G, F>, void>>
+    template <typename G>
+    requires std::is_convertible_v<G, F>
     constexpr basic_scope_guard(basic_scope_guard<G> && src) : function{src.release()} {}
 
-    template <typename G, typename = std::enable_if_t<std::is_convertible_v<G, F>, void>>
+    template <typename G>
+    requires std::is_convertible_v<G, F>
     constexpr basic_scope_guard & operator=(basic_scope_guard<G> && src)
     {
         if (this != &src)
@@ -35,10 +37,12 @@ public:
         return *this;
     }
 
-    template <typename G, typename = std::enable_if_t<std::is_convertible_v<G, F>, void>>
+    template <typename G>
+    requires std::is_convertible_v<G, F>
     constexpr basic_scope_guard(const G & function_) : function{function_} {}
 
-    template <typename G, typename = std::enable_if_t<std::is_convertible_v<G, F>, void>>
+    template <typename G>
+    requires std::is_convertible_v<G, F>
     constexpr basic_scope_guard(G && function_) : function{std::move(function_)} {}
 
     ~basic_scope_guard() { invoke(); }
@@ -64,7 +68,8 @@ public:
         return std::exchange(function, {});
     }
 
-    template <typename G, typename = std::enable_if_t<std::is_convertible_v<G, F>, void>>
+    template <typename G>
+    requires std::is_convertible_v<G, F>
     basic_scope_guard<F> & join(basic_scope_guard<G> && other)
     {
         if (other.function)

base/base/shared_ptr_helper.h

@@ -1,36 +0,0 @@
-#pragma once
-
-#include <memory>
-
-
-/** Allows to make std::shared_ptr from T with protected constructor.
-  *
-  * Derive your T class from shared_ptr_helper<T> and add shared_ptr_helper<T> as a friend
-  *  and you will have static 'create' method in your class.
-  */
-template <typename T>
-struct shared_ptr_helper
-{
-    template <typename... TArgs>
-    static std::shared_ptr<T> create(TArgs &&... args)
-    {
-        return std::shared_ptr<T>(new T(std::forward<TArgs>(args)...));
-    }
-};
-
-
-template <typename T>
-struct is_shared_ptr
-{
-    static constexpr bool value = false;
-};
-
-
-template <typename T>
-struct is_shared_ptr<std::shared_ptr<T>>
-{
-    static constexpr bool value = true;
-};
-
-template <typename T>
-inline constexpr bool is_shared_ptr_v = is_shared_ptr<T>::value;

base/base/sleep.cpp

@@ -1,7 +1,7 @@
 #include <base/sleep.h>
 
-#include <time.h>
+#include <ctime>
-#include <errno.h>
+#include <cerrno>
 
 #if defined(OS_DARWIN)
 #include <mach/mach.h>

base/base/throwError.cpp

@@ -0,0 +1,8 @@
+#include <base/throwError.h>
+#include <stdexcept>
+
+
+[[noreturn]] void throwError(const char * err)
+{
+    throw std::runtime_error(err);
+}

base/base/throwError.h

@@ -1,15 +1,8 @@
 #pragma once
 
-#include <stdexcept>
-
-
 /// Throw DB::Exception-like exception before its definition.
 /// DB::Exception derived from Poco::Exception derived from std::exception.
 /// DB::Exception generally caught as Poco::Exception. std::exception generally has other catch blocks and could lead to other outcomes.
 /// DB::Exception is not defined yet. It'd better to throw Poco::Exception but we do not want to include any big header here, even <string>.
 /// So we throw some std::exception instead in the hope its catch block is the same as DB::Exception one.
-template <typename T>
+[[noreturn]] void throwError(const char * err);
-[[noreturn]] inline void throwError(const T & err)
-{
-    throw std::runtime_error(err);
-}

base/base/unit.h

@@ -1,14 +1,19 @@
 #pragma once
 #include <cstddef>
 
-#ifdef HAS_RESERVED_IDENTIFIER
-#pragma clang diagnostic ignored "-Wreserved-identifier"
-#endif
-
 constexpr size_t KiB = 1024;
 constexpr size_t MiB = 1024 * KiB;
 constexpr size_t GiB = 1024 * MiB;
 
+#ifdef HAS_RESERVED_IDENTIFIER
+#  pragma clang diagnostic push
+#  pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 constexpr size_t operator"" _KiB(unsigned long long val) { return val * KiB; }
 constexpr size_t operator"" _MiB(unsigned long long val) { return val * MiB; }
 constexpr size_t operator"" _GiB(unsigned long long val) { return val * GiB; }
+
+#ifdef HAS_RESERVED_IDENTIFIER
+#  pragma clang diagnostic pop
+#endif

base/bridge/CMakeLists.txt

@@ -1,13 +0,0 @@
-add_library (bridge
-    IBridge.cpp
-)
-
-target_include_directories (daemon PUBLIC ..)
-target_link_libraries (bridge 
-    PRIVATE 
-	daemon
-	dbms
-	Poco::Data
-	Poco::Data::ODBC
-)
-

base/daemon/CMakeLists.txt

@@ -1,17 +0,0 @@
-add_library (daemon
-    BaseDaemon.cpp
-    GraphiteWriter.cpp
-    SentryWriter.cpp
-)
-
-target_include_directories (daemon PUBLIC ..)
-
-if (OS_DARWIN AND NOT USE_STATIC_LIBRARIES)
-    target_link_libraries (daemon PUBLIC -Wl,-undefined,dynamic_lookup)
-endif()
-
-target_link_libraries (daemon PUBLIC loggers PRIVATE clickhouse_common_io clickhouse_common_config common ${EXECINFO_LIBRARIES})
-
-if (TARGET ch_contrib::sentry)
-    target_link_libraries (daemon PRIVATE ch_contrib::sentry)
-endif ()

base/glibc-compatibility/CMakeLists.txt

@@ -51,6 +51,6 @@ if (GLIBC_COMPATIBILITY)
 
     message (STATUS "Some symbols from glibc will be replaced for compatibility")
 
-elseif (YANDEX_OFFICIAL_BUILD)
+elseif (CLICKHOUSE_OFFICIAL_BUILD)
     message (WARNING "Option GLIBC_COMPATIBILITY must be turned on for production builds.")
 endif ()

base/loggers/CMakeLists.txt

@@ -1,13 +0,0 @@
-include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
-add_headers_and_sources(loggers .)
-
-# Standard version depends on DBMS and works with text log
-add_library(loggers ${loggers_sources} ${loggers_headers})
-target_compile_definitions(loggers PUBLIC WITH_TEXT_LOG=1)
-target_link_libraries(loggers PRIVATE dbms clickhouse_common_io)
-target_include_directories(loggers PUBLIC ..)
-
-# Lightweight version doesn't work with textlog and also doesn't depend on DBMS
-add_library(loggers_no_text_log ${loggers_sources} ${loggers_headers})
-target_link_libraries(loggers_no_text_log PRIVATE clickhouse_common_io)
-target_include_directories(loggers PUBLIC ..)

benchmark/clickhouse/benchmark_cloud.sh

@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+
+QUERIES_FILE="queries.sql"
+TABLE=$1
+TRIES=3
+
+PARAMS="--host ... --secure --password ..."
+
+if [ -x ./clickhouse ]
+then
+    CLICKHOUSE_CLIENT="./clickhouse client"
+elif command -v clickhouse-client >/dev/null 2>&1
+then
+    CLICKHOUSE_CLIENT="clickhouse-client"
+else
+    echo "clickhouse-client is not found"
+    exit 1
+fi
+
+QUERY_ID_PREFIX="benchmark_$RANDOM"
+QUERY_NUM=1
+
+cat "$QUERIES_FILE" | sed "s/{table}/${TABLE}/g" | while read query
+    do
+    for i in $(seq 1 $TRIES)
+    do
+        QUERY_ID="${QUERY_ID_PREFIX}_${QUERY_NUM}_${i}"
+        ${CLICKHOUSE_CLIENT} ${PARAMS} --query_id "${QUERY_ID}" --format=Null --max_memory_usage=100G --query="$query"
+        echo -n '.'
+    done
+    QUERY_NUM=$((QUERY_NUM + 1))
+    echo
+done
+
+sleep 10
+
+${CLICKHOUSE_CLIENT} ${PARAMS} --query "
+    WITH extractGroups(query_id, '(\d+)_(\d+)\$') AS num_run, num_run[1]::UInt8 AS num, num_run[2]::UInt8 AS run
+    SELECT groupArrayInsertAt(query_duration_ms / 1000, (run - 1)::UInt8)::String || ','
+    FROM clusterAllReplicas(default, system.query_log)
+    WHERE event_date >= yesterday() AND type = 2 AND query_id LIKE '${QUERY_ID_PREFIX}%'
+    GROUP BY num ORDER BY num FORMAT TSV
+"

cmake/analysis.cmake

@@ -1,32 +0,0 @@
-# https://clang.llvm.org/extra/clang-tidy/
-option (ENABLE_CLANG_TIDY "Use clang-tidy static analyzer" OFF)
-
-if (ENABLE_CLANG_TIDY)
-    if (${CMAKE_VERSION} VERSION_LESS "3.6.0")
-        message(FATAL_ERROR "clang-tidy requires CMake version at least 3.6.")
-    endif()
-
-    find_program (CLANG_TIDY_PATH NAMES "clang-tidy" "clang-tidy-13" "clang-tidy-12" "clang-tidy-11" "clang-tidy-10" "clang-tidy-9" "clang-tidy-8")
-
-    if (CLANG_TIDY_PATH)
-        message(STATUS
-            "Using clang-tidy: ${CLANG_TIDY_PATH}.
-            The checks will be run during build process.
-            See the .clang-tidy file at the root directory to configure the checks.")
-
-        set (USE_CLANG_TIDY ON)
-
-        # clang-tidy requires assertions to guide the analysis
-        # Note that NDEBUG is set implicitly by CMake for non-debug builds
-        set(COMPILER_FLAGS "${COMPILER_FLAGS} -UNDEBUG")
-
-        # The variable CMAKE_CXX_CLANG_TIDY will be set inside src and base directories with non third-party code.
-        # set (CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_PATH}")
-    elseif (FAIL_ON_UNSUPPORTED_OPTIONS_COMBINATION)
-        message(FATAL_ERROR "clang-tidy is not found")
-    else ()
-        message(STATUS
-            "clang-tidy is not found.
-            This is normal - the tool is only used for code static analysis and isn't essential for the build.")
-    endif ()
-endif ()

cmake/arch.cmake

@@ -1,22 +1,14 @@
 if (CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64")
+    if (CMAKE_LIBRARY_ARCHITECTURE MATCHES "i386")
+        message (FATAL_ERROR "32bit platforms are not supported")
+    endif ()
     set (ARCH_AMD64 1)
-endif ()
+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)")
-if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)")
     set (ARCH_AARCH64 1)
-endif ()
+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^(ppc64le.*|PPC64LE.*)")
-if (ARCH_AARCH64 OR CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
-    set (ARCH_ARM 1)
-endif ()
-if (CMAKE_LIBRARY_ARCHITECTURE MATCHES "i386")
-    set (ARCH_I386 1)
-endif ()
-if ((ARCH_ARM AND NOT ARCH_AARCH64) OR ARCH_I386)
-    message (FATAL_ERROR "32bit platforms are not supported")
-endif ()
-if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(ppc64le.*|PPC64LE.*)")
     set (ARCH_PPC64LE 1)
-endif ()
+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "riscv64")
-if (CMAKE_SYSTEM_PROCESSOR MATCHES "riscv64")
     set (ARCH_RISCV64 1)
+else ()
+    message (FATAL_ERROR "Platform ${CMAKE_SYSTEM_PROCESSOR} is not supported")
 endif ()
-

cmake/autogenerated_versions.txt

@@ -2,11 +2,11 @@
 
 # NOTE: has nothing common with DBMS_TCP_PROTOCOL_VERSION,
 # only DBMS_TCP_PROTOCOL_VERSION should be incremented on protocol changes.
-SET(VERSION_REVISION 54461)
+SET(VERSION_REVISION 54463)
 SET(VERSION_MAJOR 22)
-SET(VERSION_MINOR 4)
+SET(VERSION_MINOR 6)
 SET(VERSION_PATCH 1)
-SET(VERSION_GITHASH 92ab33f560e638d1989c5ca543021ab53d110f5c)
+SET(VERSION_GITHASH df0cb0620985eb5ec59760cc76f7736e5b6209bb)
-SET(VERSION_DESCRIBE v22.4.1.1-testing)
+SET(VERSION_DESCRIBE v22.6.1.1-testing)
-SET(VERSION_STRING 22.4.1.1)
+SET(VERSION_STRING 22.6.1.1)
 # end of autochange

cmake/ccache.cmake

@@ -1,56 +1,53 @@
-if (CMAKE_CXX_COMPILER_LAUNCHER MATCHES "ccache" OR CMAKE_CXX_COMPILER_LAUNCHER MATCHES "ccache")
+# Setup integration with ccache to speed up builds, see https://ccache.dev/
-    set(COMPILER_MATCHES_CCACHE 1)
-else()
-    set(COMPILER_MATCHES_CCACHE 0)
-endif()
 
-if ((ENABLE_CCACHE OR NOT DEFINED ENABLE_CCACHE) AND NOT COMPILER_MATCHES_CCACHE)
+if (CMAKE_CXX_COMPILER_LAUNCHER MATCHES "ccache" OR CMAKE_C_COMPILER_LAUNCHER MATCHES "ccache")
-    find_program (CCACHE_FOUND ccache)
+    # custom compiler launcher already defined, most likely because cmake was invoked with like "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache" or
-    if (CCACHE_FOUND)
+    # via environment variable --> respect setting and trust that the launcher was specified correctly
-        set(ENABLE_CCACHE_BY_DEFAULT 1)
+    message(STATUS "Using custom C compiler launcher: ${CMAKE_C_COMPILER_LAUNCHER}")
-    else()
+    message(STATUS "Using custom C++ compiler launcher: ${CMAKE_CXX_COMPILER_LAUNCHER}")
-        set(ENABLE_CCACHE_BY_DEFAULT 0)
-    endif()
-endif()
-
-if (NOT CCACHE_FOUND AND NOT DEFINED ENABLE_CCACHE AND NOT COMPILER_MATCHES_CCACHE)
-    message(WARNING "CCache is not found. We recommend setting it up if you build ClickHouse from source often. "
-            "Setting it up will significantly reduce compilation time for 2nd and consequent builds")
-endif()
-
-# https://ccache.dev/
-option(ENABLE_CCACHE "Speedup re-compilations using ccache (external tool)" ${ENABLE_CCACHE_BY_DEFAULT})
-
-if (NOT ENABLE_CCACHE)
     return()
 endif()
 
-if (CCACHE_FOUND AND NOT COMPILER_MATCHES_CCACHE)
+option(ENABLE_CCACHE "Speedup re-compilations using ccache (external tool)" ON)
-   execute_process(COMMAND ${CCACHE_FOUND} "-V" OUTPUT_VARIABLE CCACHE_VERSION)
-   string(REGEX REPLACE "ccache version ([0-9\\.]+).*" "\\1" CCACHE_VERSION ${CCACHE_VERSION})
 
-   if (CCACHE_VERSION VERSION_GREATER "3.2.0" OR NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+if (NOT ENABLE_CCACHE)
-      message(STATUS "Using ${CCACHE_FOUND} ${CCACHE_VERSION}")
+    message(STATUS "Using ccache: no (disabled via configuration)")
-      set(LAUNCHER ${CCACHE_FOUND})
+    return()
+endif()
 
-      # debian (debhelpers) set SOURCE_DATE_EPOCH environment variable, that is
+find_program (CCACHE_EXECUTABLE ccache)
-      # filled from the debian/changelog or current time.
-      #
-      # - 4.0+ ccache always includes this environment variable into the hash
-      #   of the manifest, which do not allow to use previous cache,
-      # - 4.2+ ccache ignores SOURCE_DATE_EPOCH for every file w/o __DATE__/__TIME__
-      #
-      # Exclude SOURCE_DATE_EPOCH env for ccache versions between [4.0, 4.2).
-      if (CCACHE_VERSION VERSION_GREATER_EQUAL "4.0" AND CCACHE_VERSION VERSION_LESS "4.2")
-         message(STATUS "Ignore SOURCE_DATE_EPOCH for ccache")
-         set(LAUNCHER env -u SOURCE_DATE_EPOCH ${CCACHE_FOUND})
-      endif()
 
-      set (CMAKE_CXX_COMPILER_LAUNCHER ${LAUNCHER} ${CMAKE_CXX_COMPILER_LAUNCHER})
+if (NOT CCACHE_EXECUTABLE)
-      set (CMAKE_C_COMPILER_LAUNCHER ${LAUNCHER} ${CMAKE_C_COMPILER_LAUNCHER})
+    message(${RECONFIGURE_MESSAGE_LEVEL} "Using ccache: no (Could not find find ccache. To significantly reduce compile times for the 2nd, 3rd, etc. build, it is highly recommended to install ccache. To suppress this message, run cmake with -DENABLE_CCACHE=0)")
-   else ()
+    return()
-      message(${RECONFIGURE_MESSAGE_LEVEL} "Not using ${CCACHE_FOUND} ${CCACHE_VERSION} bug: https://bugzilla.samba.org/show_bug.cgi?id=8118")
+endif()
-   endif ()
+
-elseif (NOT CCACHE_FOUND AND NOT COMPILER_MATCHES_CCACHE)
+execute_process(COMMAND ${CCACHE_EXECUTABLE} "-V" OUTPUT_VARIABLE CCACHE_VERSION)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use ccache")
+string(REGEX REPLACE "ccache version ([0-9\\.]+).*" "\\1" CCACHE_VERSION ${CCACHE_VERSION})
-endif ()
+
+set (CCACHE_MINIMUM_VERSION 3.3)
+
+if (CCACHE_VERSION VERSION_LESS_EQUAL ${CCACHE_MINIMUM_VERSION})
+    message(${RECONFIGURE_MESSAGE_LEVEL} "Using ccache: no (found ${CCACHE_EXECUTABLE} (version ${CCACHE_VERSION}), the minimum required version is ${CCACHE_MINIMUM_VERSION}")
+    return()
+endif()
+
+message(STATUS "Using ccache: ${CCACHE_EXECUTABLE} (version ${CCACHE_VERSION})")
+set(LAUNCHER ${CCACHE_EXECUTABLE})
+
+# Work around a well-intended but unfortunate behavior of ccache 4.0 & 4.1 with
+# environment variable SOURCE_DATE_EPOCH. This variable provides an alternative
+# to source-code embedded timestamps (__DATE__/__TIME__) and therefore helps with
+# reproducible builds (*). SOURCE_DATE_EPOCH is set automatically by the
+# distribution, e.g. Debian. Ccache 4.0 & 4.1 incorporate SOURCE_DATE_EPOCH into
+# the hash calculation regardless they contain timestamps or not. This invalidates
+# the cache whenever SOURCE_DATE_EPOCH changes. As a fix, ignore SOURCE_DATE_EPOCH.
+#
+# (*) https://reproducible-builds.org/specs/source-date-epoch/
+if (CCACHE_VERSION VERSION_GREATER_EQUAL "4.0" AND CCACHE_VERSION VERSION_LESS "4.2")
+    message(STATUS "Ignore SOURCE_DATE_EPOCH for ccache 4.0 / 4.1")
+    set(LAUNCHER env -u SOURCE_DATE_EPOCH ${CCACHE_EXECUTABLE})
+endif()
+
+set (CMAKE_CXX_COMPILER_LAUNCHER ${LAUNCHER} ${CMAKE_CXX_COMPILER_LAUNCHER})
+set (CMAKE_C_COMPILER_LAUNCHER ${LAUNCHER} ${CMAKE_C_COMPILER_LAUNCHER})

cmake/check_flags.cmake

@@ -3,6 +3,5 @@ include (CheckCCompilerFlag)
 
 check_cxx_compiler_flag("-Wreserved-identifier" HAS_RESERVED_IDENTIFIER)
 check_cxx_compiler_flag("-Wsuggest-destructor-override" HAS_SUGGEST_DESTRUCTOR_OVERRIDE)
-check_cxx_compiler_flag("-Wshadow" HAS_SHADOW)
 check_cxx_compiler_flag("-Wsuggest-override" HAS_SUGGEST_OVERRIDE)
 check_cxx_compiler_flag("-Xclang -fuse-ctor-homing" HAS_USE_CTOR_HOMING)

cmake/clang_tidy.cmake

@@ -0,0 +1,25 @@
+# https://clang.llvm.org/extra/clang-tidy/
+option (ENABLE_CLANG_TIDY "Use clang-tidy static analyzer" OFF)
+
+if (ENABLE_CLANG_TIDY)
+
+    find_program (CLANG_TIDY_PATH NAMES "clang-tidy" "clang-tidy-14" "clang-tidy-13" "clang-tidy-12")
+
+    if (CLANG_TIDY_PATH)
+        message(STATUS
+            "Using clang-tidy: ${CLANG_TIDY_PATH}.
+            The checks will be run during build process.
+            See the .clang-tidy file at the root directory to configure the checks.")
+
+        set (USE_CLANG_TIDY ON)
+
+        # clang-tidy requires assertions to guide the analysis
+        # Note that NDEBUG is set implicitly by CMake for non-debug builds
+        set(COMPILER_FLAGS "${COMPILER_FLAGS} -UNDEBUG")
+
+        # The variable CMAKE_CXX_CLANG_TIDY will be set inside src and base directories with non third-party code.
+        # set (CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_PATH}")
+    else ()
+        message(${RECONFIGURE_MESSAGE_LEVEL} "clang-tidy is not found")
+    endif ()
+endif ()

cmake/cpu_features.cmake

@@ -31,7 +31,11 @@ if (ARCH_NATIVE)
 elseif (ARCH_AARCH64)
     set (COMPILER_FLAGS "${COMPILER_FLAGS} -march=armv8-a+crc")
 
-else ()
+elseif (ARCH_PPC64LE)
+    # Note that gcc and clang have support for x86 SSE2 intrinsics when building for PowerPC
+    set (COMPILER_FLAGS "${COMPILER_FLAGS} -maltivec -mcpu=power8 -D__SSE2__=1 -DNO_WARN_X86_INTRINSICS")
+
+elseif (ARCH_AMD64)
     set (TEST_FLAG "-mssse3")
     set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
     check_cxx_source_compiles("
@@ -60,10 +64,6 @@ else ()
         set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
     endif ()
 
-    if (ARCH_PPC64LE)
-        set (COMPILER_FLAGS "${COMPILER_FLAGS} -maltivec -D__SSE2__=1 -DNO_WARN_X86_INTRINSICS")
-    endif ()
-
     set (TEST_FLAG "-msse4.2")
     set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
     check_cxx_source_compiles("
@@ -93,7 +93,6 @@ else ()
     endif ()
 
     set (TEST_FLAG "-mpopcnt")
-
     set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
     check_cxx_source_compiles("
         int main() {
@@ -186,6 +185,8 @@ else ()
             set (X86_INTRINSICS_FLAGS "${X86_INTRINSICS_FLAGS} -mavx512f -mavx512bw -mavx512vl -mprefer-vector-width=256")
         endif ()
     endif ()
+else ()
+    # RISC-V + exotic platforms
 endif ()
 
 cmake_pop_check_state ()

cmake/dbms_glob_sources.cmake

@@ -1,5 +1,5 @@
 macro(add_glob cur_list)
-    file(GLOB __tmp RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${ARGN})
+    file(GLOB __tmp CONFIGURE_DEPENDS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${ARGN})
     list(APPEND ${cur_list} ${__tmp})
 endmacro()
 

cmake/generate_code.cmake

@@ -1,5 +0,0 @@
-function(generate_code TEMPLATE_FILE)
-    foreach(NAME IN LISTS ARGN)
-       configure_file (${TEMPLATE_FILE}.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/generated/${TEMPLATE_FILE}_${NAME}.cpp)
-    endforeach()
-endfunction()

cmake/git_status.cmake

@@ -1,17 +1,22 @@
 # Print the status of the git repository (if git is available).
 # This is useful for troubleshooting build failure reports
+
 find_package(Git)
 
 if (Git_FOUND)
+
   execute_process(
     COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     OUTPUT_VARIABLE GIT_COMMIT_ID
     OUTPUT_STRIP_TRAILING_WHITESPACE)
+
   message(STATUS "HEAD's commit hash ${GIT_COMMIT_ID}")
+
   execute_process(
     COMMAND ${GIT_EXECUTABLE} status
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_STRIP_TRAILING_WHITESPACE)
+
 else()
-  message(STATUS "The git program could not be found.")
+  message(STATUS "Git could not be found.")
 endif()

cmake/strip.sh

@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-BINARY_PATH=$1
-BINARY_NAME=$(basename "$BINARY_PATH")
-DESTINATION_STRIPPED_DIR=$2
-OBJCOPY_PATH=${3:objcopy}
-READELF_PATH=${4:readelf}
-
-BUILD_ID=$($READELF_PATH -n "$1" | sed -n '/Build ID/ { s/.*: //p; q; }')
-BUILD_ID_PREFIX=${BUILD_ID:0:2}
-BUILD_ID_SUFFIX=${BUILD_ID:2}
-
-DESTINATION_DEBUG_INFO_DIR="$DESTINATION_STRIPPED_DIR/lib/debug/.build-id"
-DESTINATION_STRIP_BINARY_DIR="$DESTINATION_STRIPPED_DIR/bin"
-
-mkdir -p "$DESTINATION_DEBUG_INFO_DIR/$BUILD_ID_PREFIX"
-mkdir -p "$DESTINATION_STRIP_BINARY_DIR"
-
-
-cp "$BINARY_PATH" "$DESTINATION_STRIP_BINARY_DIR/$BINARY_NAME"
-
-$OBJCOPY_PATH --only-keep-debug --compress-debug-sections "$DESTINATION_STRIP_BINARY_DIR/$BINARY_NAME" "$DESTINATION_DEBUG_INFO_DIR/$BUILD_ID_PREFIX/$BUILD_ID_SUFFIX.debug"
-chmod 0644 "$DESTINATION_DEBUG_INFO_DIR/$BUILD_ID_PREFIX/$BUILD_ID_SUFFIX.debug"
-chown 0:0 "$DESTINATION_DEBUG_INFO_DIR/$BUILD_ID_PREFIX/$BUILD_ID_SUFFIX.debug"
-
-strip --remove-section=.comment --remove-section=.note "$DESTINATION_STRIP_BINARY_DIR/$BINARY_NAME"
-
-$OBJCOPY_PATH --add-gnu-debuglink "$DESTINATION_DEBUG_INFO_DIR/$BUILD_ID_PREFIX/$BUILD_ID_SUFFIX.debug" "$DESTINATION_STRIP_BINARY_DIR/$BINARY_NAME"

cmake/strip_binary.cmake

@@ -11,16 +11,43 @@ macro(clickhouse_strip_binary)
        message(FATAL_ERROR "A binary path name must be provided for stripping binary")
    endif()
 
-
    if (NOT DEFINED STRIP_DESTINATION_DIR)
        message(FATAL_ERROR "Destination directory for stripped binary must be provided")
    endif()
 
    add_custom_command(TARGET ${STRIP_TARGET} POST_BUILD
-     COMMAND bash ${ClickHouse_SOURCE_DIR}/cmake/strip.sh ${STRIP_BINARY_PATH} ${STRIP_DESTINATION_DIR} ${OBJCOPY_PATH} ${READELF_PATH}
+       COMMAND mkdir -p "${STRIP_DESTINATION_DIR}/lib/debug/bin"
-     COMMENT "Stripping clickhouse binary" VERBATIM
+       COMMAND mkdir -p "${STRIP_DESTINATION_DIR}/bin"
+       COMMAND cp "${STRIP_BINARY_PATH}" "${STRIP_DESTINATION_DIR}/bin/${STRIP_TARGET}"
+       COMMAND "${OBJCOPY_PATH}" --only-keep-debug --compress-debug-sections "${STRIP_DESTINATION_DIR}/bin/${STRIP_TARGET}" "${STRIP_DESTINATION_DIR}/lib/debug/bin/${STRIP_TARGET}.debug"
+       COMMAND chmod 0644 "${STRIP_DESTINATION_DIR}/lib/debug/bin/${STRIP_TARGET}.debug"
+       COMMAND "${STRIP_PATH}" --remove-section=.comment --remove-section=.note "${STRIP_DESTINATION_DIR}/bin/${STRIP_TARGET}"
+       COMMAND "${OBJCOPY_PATH}" --add-gnu-debuglink "${STRIP_DESTINATION_DIR}/lib/debug/bin/${STRIP_TARGET}.debug" "${STRIP_DESTINATION_DIR}/bin/${STRIP_TARGET}"
+       COMMENT "Stripping clickhouse binary" VERBATIM
    )
 
    install(PROGRAMS ${STRIP_DESTINATION_DIR}/bin/${STRIP_TARGET} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-   install(DIRECTORY ${STRIP_DESTINATION_DIR}/lib/debug DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT clickhouse)
+   install(FILES ${STRIP_DESTINATION_DIR}/lib/debug/bin/${STRIP_TARGET}.debug DESTINATION ${CMAKE_INSTALL_LIBDIR}/debug/${CMAKE_INSTALL_FULL_BINDIR} COMPONENT clickhouse)
+endmacro()
+
+
+macro(clickhouse_make_empty_debug_info_for_nfpm)
+   set(oneValueArgs TARGET DESTINATION_DIR)
+   cmake_parse_arguments(EMPTY_DEBUG "" "${oneValueArgs}" "" ${ARGN})
+
+   if (NOT DEFINED EMPTY_DEBUG_TARGET)
+       message(FATAL_ERROR "A target name must be provided for stripping binary")
+   endif()
+
+   if (NOT DEFINED EMPTY_DEBUG_DESTINATION_DIR)
+       message(FATAL_ERROR "Destination directory for empty debug must be provided")
+   endif()
+
+   add_custom_command(TARGET ${EMPTY_DEBUG_TARGET} POST_BUILD
+       COMMAND mkdir -p "${EMPTY_DEBUG_DESTINATION_DIR}/lib/debug"
+       COMMAND touch "${EMPTY_DEBUG_DESTINATION_DIR}/lib/debug/${EMPTY_DEBUG_TARGET}.debug"
+       COMMENT "Adding empty debug info for NFPM" VERBATIM
+   )
+
+   install(FILES "${EMPTY_DEBUG_DESTINATION_DIR}/lib/debug/${EMPTY_DEBUG_TARGET}.debug" DESTINATION "${CMAKE_INSTALL_LIBDIR}/debug/${CMAKE_INSTALL_FULL_BINDIR}" COMPONENT clickhouse)
 endmacro()

cmake/target.cmake

@@ -15,6 +15,8 @@ elseif (CMAKE_SYSTEM_NAME MATCHES "Darwin")
 elseif (CMAKE_SYSTEM_NAME MATCHES "SunOS")
     set (OS_SUNOS 1)
     add_definitions(-D OS_SUNOS)
+else ()
+    message (FATAL_ERROR "Platform ${CMAKE_SYSTEM_NAME} is not supported")
 endif ()
 
 if (CMAKE_CROSSCOMPILING)

cmake/tools.cmake

@@ -6,67 +6,65 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
     set (COMPILER_CLANG 1) # Safe to treat AppleClang as a regular Clang, in general.
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     set (COMPILER_CLANG 1)
+else ()
+    message (FATAL_ERROR "Compiler ${CMAKE_CXX_COMPILER_ID} is not supported")
 endif ()
 
-execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version)
+# Print details to output
+execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version OUTPUT_VARIABLE COMPILER_SELF_IDENTIFICATION OUTPUT_STRIP_TRAILING_WHITESPACE)
+message (STATUS "Using compiler:\n${COMPILER_SELF_IDENTIFICATION}")
+
+# Require minimum compiler versions
+set (CLANG_MINIMUM_VERSION 12)
+set (XCODE_MINIMUM_VERSION 12.0)
+set (APPLE_CLANG_MINIMUM_VERSION 12.0.0)
+set (GCC_MINIMUM_VERSION 11)
 
 if (COMPILER_GCC)
-    # Require minimum version of gcc
+    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${GCC_MINIMUM_VERSION})
-    set (GCC_MINIMUM_VERSION 11)
+        message (FATAL_ERROR "Compilation with GCC version ${CMAKE_CXX_COMPILER_VERSION} is unsupported, the minimum required version is ${GCC_MINIMUM_VERSION}.")
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${GCC_MINIMUM_VERSION} AND NOT CMAKE_VERSION VERSION_LESS 2.8.9)
-        message (FATAL_ERROR "GCC version must be at least ${GCC_MINIMUM_VERSION}. For example, if GCC ${GCC_MINIMUM_VERSION} is available under gcc-${GCC_MINIMUM_VERSION}, g++-${GCC_MINIMUM_VERSION} names, do the following: export CC=gcc-${GCC_MINIMUM_VERSION} CXX=g++-${GCC_MINIMUM_VERSION}; rm -rf CMakeCache.txt CMakeFiles; and re run cmake or ./release.")
     endif ()
 
-    message (WARNING "GCC compiler is not officially supported for ClickHouse. You should migrate to clang.")
+    message (WARNING "Compilation with GCC is unsupported. Please use Clang instead.")
 
 elseif (COMPILER_CLANG)
-    # Require minimum version of clang/apple-clang
     if (CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
         # (Experimental!) Specify "-DALLOW_APPLECLANG=ON" when running CMake configuration step, if you want to experiment with using it.
         if (NOT ALLOW_APPLECLANG AND NOT DEFINED ENV{ALLOW_APPLECLANG})
-            message (FATAL_ERROR "AppleClang is not supported, you should install clang from brew. See the instruction: https://clickhouse.com/docs/en/development/build-osx/")
+            message (FATAL_ERROR "Compilation with AppleClang is unsupported. Please use vanilla Clang, e.g. from Homebrew.")
         endif ()
 
-        # AppleClang 10.0.1 (Xcode 10.2) corresponds to LLVM/Clang upstream version 7.0.0
+        # For a mapping between XCode / AppleClang / vanilla Clang versions, see https://en.wikipedia.org/wiki/Xcode
-        # AppleClang 11.0.0 (Xcode 11.0) corresponds to LLVM/Clang upstream version 8.0.0
-        set (XCODE_MINIMUM_VERSION 10.2)
-        set (APPLE_CLANG_MINIMUM_VERSION 10.0.1)
         if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${APPLE_CLANG_MINIMUM_VERSION})
-            message (FATAL_ERROR "AppleClang compiler version must be at least ${APPLE_CLANG_MINIMUM_VERSION} (Xcode ${XCODE_MINIMUM_VERSION}).")
+            message (FATAL_ERROR "Compilation with AppleClang version ${CMAKE_CXX_COMPILER_VERSION} is unsupported, the minimum required version is ${APPLE_CLANG_MINIMUM_VERSION} (Xcode ${XCODE_MINIMUM_VERSION}).")
-        elseif (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11.0.0)
-            # char8_t is available starting (upstream vanilla) Clang 7, but prior to Clang 8,
-            # it is not enabled by -std=c++20 and can be enabled with an explicit -fchar8_t.
-            set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fchar8_t")
-            set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fchar8_t")
         endif ()
     else ()
-        set (CLANG_MINIMUM_VERSION 12)
         if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${CLANG_MINIMUM_VERSION})
-            message (FATAL_ERROR "Clang version must be at least ${CLANG_MINIMUM_VERSION}.")
+            message (FATAL_ERROR "Compilation with Clang version ${CMAKE_CXX_COMPILER_VERSION} is unsupported, the minimum required version is ${CLANG_MINIMUM_VERSION}.")
         endif ()
     endif ()
-else ()
-    message (WARNING "You are using an unsupported compiler. Compilation has only been tested with Clang and GCC.")
 endif ()
 
+# Linker
+
 string (REGEX MATCHALL "[0-9]+" COMPILER_VERSION_LIST ${CMAKE_CXX_COMPILER_VERSION})
 list (GET COMPILER_VERSION_LIST 0 COMPILER_VERSION_MAJOR)
 
-# Linker
-
 # Example values: `lld-10`, `gold`.
 option (LINKER_NAME "Linker name or full path")
 
-if (COMPILER_GCC AND NOT LINKER_NAME)
+if (NOT LINKER_NAME)
-    find_program (LLD_PATH NAMES "ld.lld")
+    if (COMPILER_GCC)
-    find_program (GOLD_PATH NAMES "ld.gold")
+        find_program (LLD_PATH NAMES "ld.lld")
-elseif (NOT LINKER_NAME)
+        find_program (GOLD_PATH NAMES "ld.gold")
-    find_program (LLD_PATH NAMES "ld.lld-${COMPILER_VERSION_MAJOR}" "lld-${COMPILER_VERSION_MAJOR}" "ld.lld" "lld")
+    elseif (COMPILER_CLANG)
-    find_program (GOLD_PATH NAMES "ld.gold" "gold")
+        find_program (LLD_PATH NAMES "ld.lld-${COMPILER_VERSION_MAJOR}" "lld-${COMPILER_VERSION_MAJOR}" "ld.lld" "lld")
-endif ()
+        find_program (GOLD_PATH NAMES "ld.gold" "gold")
+    endif ()
+endif()
 
 if (OS_LINUX AND NOT LINKER_NAME)
-    # We prefer LLD linker over Gold or BFD on Linux.
+    # prefer lld linker over gold or ld on linux
     if (LLD_PATH)
         if (COMPILER_GCC)
             # GCC driver requires one of supported linker names like "lld".
@@ -87,9 +85,10 @@ if (OS_LINUX AND NOT LINKER_NAME)
         endif ()
     endif ()
 endif ()
+# TODO: allow different linker on != OS_LINUX
 
 if (LINKER_NAME)
-    if (COMPILER_CLANG AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 12.0.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 12.0.0))
+    if (COMPILER_CLANG)
         find_program (LLD_PATH NAMES ${LINKER_NAME})
         if (NOT LLD_PATH)
             message (FATAL_ERROR "Using linker ${LINKER_NAME} but can't find its path.")
@@ -101,9 +100,14 @@ if (LINKER_NAME)
         set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=${LINKER_NAME}")
     endif ()
 
-    message(STATUS "Using custom linker by name: ${LINKER_NAME}")
 endif ()
 
+if (LINKER_NAME)
+    message(STATUS "Using linker: ${LINKER_NAME}")
+else()
+    message(STATUS "Using linker: <default>")
+endif()
+
 # Archiver
 
 if (COMPILER_GCC)
@@ -116,6 +120,8 @@ if (LLVM_AR_PATH)
     set (CMAKE_AR "${LLVM_AR_PATH}")
 endif ()
 
+message(STATUS "Using archiver: ${CMAKE_AR}")
+
 # Ranlib
 
 if (COMPILER_GCC)
@@ -128,6 +134,8 @@ if (LLVM_RANLIB_PATH)
     set (CMAKE_RANLIB "${LLVM_RANLIB_PATH}")
 endif ()
 
+message(STATUS "Using ranlib: ${CMAKE_RANLIB}")
+
 # Install Name Tool
 
 if (COMPILER_GCC)
@@ -140,6 +148,8 @@ if (LLVM_INSTALL_NAME_TOOL_PATH)
     set (CMAKE_INSTALL_NAME_TOOL "${LLVM_INSTALL_NAME_TOOL_PATH}")
 endif ()
 
+message(STATUS "Using install-name-tool: ${CMAKE_INSTALL_NAME_TOOL}")
+
 # Objcopy
 
 if (COMPILER_GCC)
@@ -148,54 +158,22 @@ else ()
     find_program (OBJCOPY_PATH NAMES "llvm-objcopy-${COMPILER_VERSION_MAJOR}" "llvm-objcopy" "objcopy")
 endif ()
 
-if (NOT OBJCOPY_PATH AND OS_DARWIN)
-    find_program (BREW_PATH NAMES "brew")
-    if (BREW_PATH)
-        execute_process (COMMAND ${BREW_PATH} --prefix llvm ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE LLVM_PREFIX)
-        if (LLVM_PREFIX)
-            find_program (OBJCOPY_PATH NAMES "llvm-objcopy" PATHS "${LLVM_PREFIX}/bin" NO_DEFAULT_PATH)
-        endif ()
-        if (NOT OBJCOPY_PATH)
-            execute_process (COMMAND ${BREW_PATH} --prefix binutils ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE BINUTILS_PREFIX)
-            if (BINUTILS_PREFIX)
-                find_program (OBJCOPY_PATH NAMES "objcopy" PATHS "${BINUTILS_PREFIX}/bin" NO_DEFAULT_PATH)
-            endif ()
-        endif ()
-    endif ()
-endif ()
-
 if (OBJCOPY_PATH)
     message (STATUS "Using objcopy: ${OBJCOPY_PATH}")
 else ()
     message (FATAL_ERROR "Cannot find objcopy.")
 endif ()
 
-# Readelf (FIXME copypaste)
+# Strip
 
 if (COMPILER_GCC)
-    find_program (READELF_PATH NAMES "llvm-readelf" "llvm-readelf-13" "llvm-readelf-12" "llvm-readelf-11" "readelf")
+    find_program (STRIP_PATH NAMES "llvm-strip" "llvm-strip-13" "llvm-strip-12" "llvm-strip-11" "strip")
 else ()
-    find_program (READELF_PATH NAMES "llvm-readelf-${COMPILER_VERSION_MAJOR}" "llvm-readelf" "readelf")
+    find_program (STRIP_PATH NAMES "llvm-strip-${COMPILER_VERSION_MAJOR}" "llvm-strip" "strip")
 endif ()
 
-if (NOT READELF_PATH AND OS_DARWIN)
+if (STRIP_PATH)
-    find_program (BREW_PATH NAMES "brew")
+    message (STATUS "Using strip: ${STRIP_PATH}")
-    if (BREW_PATH)
-        execute_process (COMMAND ${BREW_PATH} --prefix llvm ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE LLVM_PREFIX)
-        if (LLVM_PREFIX)
-            find_program (READELF_PATH NAMES "llvm-readelf" PATHS "${LLVM_PREFIX}/bin" NO_DEFAULT_PATH)
-        endif ()
-        if (NOT READELF_PATH)
-            execute_process (COMMAND ${BREW_PATH} --prefix binutils ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE BINUTILS_PREFIX)
-            if (BINUTILS_PREFIX)
-                find_program (READELF_PATH NAMES "readelf" PATHS "${BINUTILS_PREFIX}/bin" NO_DEFAULT_PATH)
-            endif ()
-        endif ()
-    endif ()
-endif ()
-
-if (READELF_PATH)
-    message (STATUS "Using readelf: ${READELF_PATH}")
 else ()
-    message (FATAL_ERROR "Cannot find readelf.")
+    message (FATAL_ERROR "Cannot find strip.")
 endif ()

cmake/version.cmake

@@ -18,6 +18,6 @@ set (VERSION_STRING_SHORT "${VERSION_MAJOR}.${VERSION_MINOR}")
 
 math (EXPR VERSION_INTEGER "${VERSION_PATCH} + ${VERSION_MINOR}*1000 + ${VERSION_MAJOR}*1000000")
 
-if(YANDEX_OFFICIAL_BUILD)
+if(CLICKHOUSE_OFFICIAL_BUILD)
     set(VERSION_OFFICIAL " (official build)")
 endif()

cmake/warnings.cmake

@@ -7,12 +7,7 @@
 # - sometimes warnings from 3rd party libraries may come from macro substitutions in our code
 #   and we have to wrap them with #pragma GCC/clang diagnostic ignored
 
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
-
-# Add some warnings that are not available even with -Wall -Wextra -Wpedantic.
-# Intended for exploration of new compiler warnings that may be found useful.
-# Applies to clang only
-option (WEVERYTHING "Enable -Weverything option with some exceptions." ON)
 
 # Control maximum size of stack frames. It can be important if the code is run in fibers with small stack size.
 # Only in release build because debug has too large stack frames.
@@ -21,80 +16,42 @@ if ((NOT CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG") AND (NOT SANITIZE) AND (NOT CMAKE
 endif ()
 
 if (COMPILER_CLANG)
+    # Add some warnings that are not available even with -Wall -Wextra -Wpedantic.
+    # We want to get everything out of the compiler for code quality.
+    add_warning(everything)
+
     add_warning(pedantic)
     no_warning(vla-extension)
     no_warning(zero-length-array)
     no_warning(c11-extensions)
-
+    no_warning(unused-command-line-argument)
-    if (WEVERYTHING)
+    no_warning(c++98-compat-pedantic)
-        add_warning(everything)
+    no_warning(c++98-compat)
-        no_warning(c++98-compat-pedantic)
+    no_warning(c99-extensions)
-        no_warning(c++98-compat)
+    no_warning(conversion)
-        no_warning(c99-extensions)
+    no_warning(ctad-maybe-unsupported) # clang 9+, linux-only
-        no_warning(conversion)
+    no_warning(deprecated-dynamic-exception-spec)
-        no_warning(ctad-maybe-unsupported) # clang 9+, linux-only
+    no_warning(disabled-macro-expansion)
-        no_warning(deprecated-dynamic-exception-spec)
+    no_warning(documentation-unknown-command)
-        no_warning(disabled-macro-expansion)
+    no_warning(double-promotion)
-        no_warning(documentation-unknown-command)
+    no_warning(exit-time-destructors)
-        no_warning(double-promotion)
+    no_warning(float-equal)
-        no_warning(exit-time-destructors)
+    no_warning(global-constructors)
-        no_warning(float-equal)
+    no_warning(missing-prototypes)
-        no_warning(global-constructors)
+    no_warning(missing-variable-declarations)
-        no_warning(missing-prototypes)
+    no_warning(nested-anon-types)
-        no_warning(missing-variable-declarations)
+    no_warning(packed)
-        no_warning(nested-anon-types)
+    no_warning(padded)
-        no_warning(packed)
+    no_warning(return-std-move-in-c++11) # clang 7+
-        no_warning(padded)
+    no_warning(shift-sign-overflow)
-        no_warning(return-std-move-in-c++11) # clang 7+
+    no_warning(sign-conversion)
-        no_warning(shift-sign-overflow)
+    no_warning(switch-enum)
-        no_warning(sign-conversion)
+    no_warning(undefined-func-template)
-        no_warning(switch-enum)
+    no_warning(unused-template)
-        no_warning(undefined-func-template)
+    no_warning(vla)
-        no_warning(unused-template)
+    no_warning(weak-template-vtables)
-        no_warning(vla)
+    no_warning(weak-vtables)
-        no_warning(weak-template-vtables)
+    # TODO Enable conversion, sign-conversion, double-promotion warnings.
-        no_warning(weak-vtables)
-
-        # TODO Enable conversion, sign-conversion, double-promotion warnings.
-    else ()
-        add_warning(comma)
-        add_warning(conditional-uninitialized)
-        add_warning(covered-switch-default)
-        add_warning(deprecated)
-        add_warning(embedded-directive)
-        add_warning(empty-init-stmt) # linux-only
-        add_warning(extra-semi-stmt) # linux-only
-        add_warning(extra-semi)
-        add_warning(gnu-case-range)
-        add_warning(inconsistent-missing-destructor-override)
-        add_warning(newline-eof)
-        add_warning(old-style-cast)
-        add_warning(range-loop-analysis)
-        add_warning(redundant-parens)
-        add_warning(reserved-id-macro)
-        add_warning(shadow-field)
-        add_warning(shadow-uncaptured-local)
-        add_warning(shadow)
-        add_warning(string-plus-int)
-        add_warning(undef)
-        add_warning(unreachable-code-return)
-        add_warning(unreachable-code)
-        add_warning(unused-exception-parameter)
-        add_warning(unused-macros)
-        add_warning(unused-member-function)
-        add_warning(unneeded-internal-declaration)
-        add_warning(implicit-int-float-conversion)
-        add_warning(no-delete-null-pointer-checks)
-        add_warning(anon-enum-enum-conversion)
-        add_warning(assign-enum)
-        add_warning(bitwise-op-parentheses)
-        add_warning(int-in-bool-context)
-        add_warning(sometimes-uninitialized)
-        add_warning(tautological-bitwise-compare)
-
-        # XXX: libstdc++ has some of these for 3way compare
-        add_warning(zero-as-null-pointer-constant)
-    endif ()
 elseif (COMPILER_GCC)
     # Add compiler options only to c++ compiler
     function(add_cxx_compile_options option)
@@ -158,12 +115,8 @@ elseif (COMPILER_GCC)
     add_cxx_compile_options(-Wsizeof-array-argument)
     # Warn for suspicious length parameters to certain string and memory built-in functions if the argument uses sizeof
     add_cxx_compile_options(-Wsizeof-pointer-memaccess)
-
+    # Warn about overriding virtual functions that are not marked with the override keyword
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 9)
+    add_cxx_compile_options(-Wsuggest-override)
-        # Warn about overriding virtual functions that are not marked with the override keyword
-        add_cxx_compile_options(-Wsuggest-override)
-    endif ()
-
     # Warn whenever a switch statement has an index of boolean type and the case values are outside the range of a boolean type
     add_cxx_compile_options(-Wswitch-bool)
     # Warn if a self-comparison always evaluates to true or false
@@ -178,41 +131,36 @@ elseif (COMPILER_GCC)
     # Warn when a literal 0 is used as null pointer constant.
     add_cxx_compile_options(-Wzero-as-null-pointer-constant)
 
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 10)
+    # The following warnings are generally useful but had to be disabled because of compiler bugs with older GCCs.
-        # XXX: gcc10 stuck with this option while compiling GatherUtils code
+    # XXX: We should try again on more recent GCCs (--> see CMake variable GCC_MINIMUM_VERSION).
-        # (anyway there are builds with clang, that will warn)
-        add_cxx_compile_options(-Wno-sequence-point)
-        # XXX: gcc10 false positive with this warning in MergeTreePartition.cpp
-        #     inlined from 'void writeHexByteLowercase(UInt8, void*)' at ../src/Common/hex.h:39:11,
-        #     inlined from 'DB::String DB::MergeTreePartition::getID(const DB::Block&) const' at ../src/Storages/MergeTree/MergeTreePartition.cpp:85:30:
-        #     ../contrib/libc-headers/x86_64-linux-gnu/bits/string_fortified.h:34:33: error: writing 2 bytes into a region of size 0 [-Werror=stringop-overflow=]
-        #     34 |   return __builtin___memcpy_chk (__dest, __src, __len, __bos0 (__dest));
-        # For some reason (bug in gcc?) macro 'GCC diagnostic ignored "-Wstringop-overflow"' doesn't help.
-        add_cxx_compile_options(-Wno-stringop-overflow)
-    endif()
 
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 11)
+    # gcc10 stuck with this option while compiling GatherUtils code, anyway there are builds with clang that will warn
-        # reinterpretAs.cpp:182:31: error: ‘void* memcpy(void*, const void*, size_t)’ copying an object of non-trivial type
+    add_cxx_compile_options(-Wno-sequence-point)
-        # ‘using ToFieldType = using FieldType = using UUID = struct StrongTypedef<wide::integer<128, unsigned int>, DB::UUIDTag>’
+    # gcc10 false positive with this warning in MergeTreePartition.cpp
-        # {aka ‘struct StrongTypedef<wide::integer<128, unsigned int>, DB::UUIDTag>’} from an array of ‘const char8_t’
+    #     inlined from 'void writeHexByteLowercase(UInt8, void*)' at ../src/Common/hex.h:39:11,
-        add_cxx_compile_options(-Wno-error=class-memaccess)
+    #     inlined from 'DB::String DB::MergeTreePartition::getID(const DB::Block&) const' at ../src/Storages/MergeTree/MergeTreePartition.cpp:85:30:
-
+    #     ../contrib/libc-headers/x86_64-linux-gnu/bits/string_fortified.h:34:33: error: writing 2 bytes into a region of size 0 [-Werror=stringop-overflow=]
-        # Maybe false positive...
+    #     34 |   return __builtin___memcpy_chk (__dest, __src, __len, __bos0 (__dest));
-        # In file included from /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/memory:673,
+    # For some reason (bug in gcc?) macro 'GCC diagnostic ignored "-Wstringop-overflow"' doesn't help.
-        # In function ‘void std::__1::__libcpp_operator_delete(_Args ...) [with _Args = {void*, long unsigned int}]’,
+    add_cxx_compile_options(-Wno-stringop-overflow)
-        # inlined from ‘void std::__1::__do_deallocate_handle_size(void*, size_t, _Args ...) [with _Args = {}]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/new:271:34,
+    # reinterpretAs.cpp:182:31: error: ‘void* memcpy(void*, const void*, size_t)’ copying an object of non-trivial type
-        # inlined from ‘void std::__1::__libcpp_deallocate(void*, size_t, size_t)’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/new:285:41,
+    # ‘using ToFieldType = using FieldType = using UUID = struct StrongTypedef<wide::integer<128, unsigned int>, DB::UUIDTag>’
-        # inlined from ‘constexpr void std::__1::allocator<_Tp>::deallocate(_Tp*, size_t) [with _Tp = char]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/memory:849:39,
+    # {aka ‘struct StrongTypedef<wide::integer<128, unsigned int>, DB::UUIDTag>’} from an array of ‘const char8_t’
-        # inlined from ‘static constexpr void std::__1::allocator_traits<_Alloc>::deallocate(std::__1::allocator_traits<_Alloc>::allocator_type&, std::__1::allocator_traits<_Alloc>::pointer, std::__1::allocator_traits<_Alloc>::size_type) [with _Alloc = std::__1::allocator<char>]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/__memory/allocator_traits.h:476:24,
+    add_cxx_compile_options(-Wno-error=class-memaccess)
-        # inlined from ‘std::__1::basic_string<_CharT, _Traits, _Allocator>::~basic_string() [with _CharT = char; _Traits = std::__1::char_traits<char>; _Allocator = std::__1::allocator<char>]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/string:2219:35,
+    # Maybe false positive...
-        # inlined from ‘std::__1::basic_string<_CharT, _Traits, _Allocator>::~basic_string() [with _CharT = char; _Traits = std::__1::char_traits<char>; _Allocator = std::__1::allocator<char>]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/string:2213:1,
+    # In file included from /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/memory:673,
-        # inlined from ‘DB::JSONBuilder::JSONMap::Pair::~Pair()’ at /home/jakalletti/ClickHouse/ClickHouse/src/Common/JSONBuilder.h:90:12,
+    # In function ‘void std::__1::__libcpp_operator_delete(_Args ...) [with _Args = {void*, long unsigned int}]’,
-        # inlined from ‘void DB::JSONBuilder::JSONMap::add(std::__1::string, DB::JSONBuilder::ItemPtr)’ at /home/jakalletti/ClickHouse/ClickHouse/src/Common/JSONBuilder.h:97:68,
+    # inlined from ‘void std::__1::__do_deallocate_handle_size(void*, size_t, _Args ...) [with _Args = {}]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/new:271:34,
-        # inlined from ‘virtual void DB::ExpressionStep::describeActions(DB::JSONBuilder::JSONMap&) const’ at /home/jakalletti/ClickHouse/ClickHouse/src/Processors/QueryPlan/ExpressionStep.cpp:102:12:
+    # inlined from ‘void std::__1::__libcpp_deallocate(void*, size_t, size_t)’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/new:285:41,
-        # /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/new:247:20: error: ‘void operator delete(void*, size_t)’ called on a pointer to an unallocated object ‘7598543875853023301’ [-Werror=free-nonheap-object]
+    # inlined from ‘constexpr void std::__1::allocator<_Tp>::deallocate(_Tp*, size_t) [with _Tp = char]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/memory:849:39,
-        add_cxx_compile_options(-Wno-error=free-nonheap-object)
+    # inlined from ‘static constexpr void std::__1::allocator_traits<_Alloc>::deallocate(std::__1::allocator_traits<_Alloc>::allocator_type&, std::__1::allocator_traits<_Alloc>::pointer, std::__1::allocator_traits<_Alloc>::size_type) [with _Alloc = std::__1::allocator<char>]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/__memory/allocator_traits.h:476:24,
-
+    # inlined from ‘std::__1::basic_string<_CharT, _Traits, _Allocator>::~basic_string() [with _CharT = char; _Traits = std::__1::char_traits<char>; _Allocator = std::__1::allocator<char>]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/string:2219:35,
-        # AggregateFunctionAvg.h:203:100: error: ‘this’ pointer is null [-Werror=nonnull]
+    # inlined from ‘std::__1::basic_string<_CharT, _Traits, _Allocator>::~basic_string() [with _CharT = char; _Traits = std::__1::char_traits<char>; _Allocator = std::__1::allocator<char>]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/string:2213:1,
-        add_cxx_compile_options(-Wno-error=nonnull)
+    # inlined from ‘DB::JSONBuilder::JSONMap::Pair::~Pair()’ at /home/jakalletti/ClickHouse/ClickHouse/src/Common/JSONBuilder.h:90:12,
-    endif()
+    # inlined from ‘void DB::JSONBuilder::JSONMap::add(std::__1::string, DB::JSONBuilder::ItemPtr)’ at /home/jakalletti/ClickHouse/ClickHouse/src/Common/JSONBuilder.h:97:68,
+    # inlined from ‘virtual void DB::ExpressionStep::describeActions(DB::JSONBuilder::JSONMap&) const’ at /home/jakalletti/ClickHouse/ClickHouse/src/Processors/QueryPlan/ExpressionStep.cpp:102:12:
+    # /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/new:247:20: error: ‘void operator delete(void*, size_t)’ called on a pointer to an unallocated object ‘7598543875853023301’ [-Werror=free-nonheap-object]
+    add_cxx_compile_options(-Wno-error=free-nonheap-object)
+    # AggregateFunctionAvg.h:203:100: error: ‘this’ pointer is null [-Werror=nonnull]
+    add_cxx_compile_options(-Wno-error=nonnull)
 endif ()

contrib/CMakeLists.txt

@@ -94,6 +94,7 @@ if (ENABLE_FUZZING)
     add_contrib (libprotobuf-mutator-cmake libprotobuf-mutator)
 endif()
 
+add_contrib (wyhash-cmake wyhash)
 add_contrib (cityhash102)
 add_contrib (libfarmhash)
 add_contrib (icu-cmake icu)
@@ -119,9 +120,13 @@ add_contrib (fastops-cmake fastops)
 add_contrib (libuv-cmake libuv)
 add_contrib (amqpcpp-cmake AMQP-CPP) # requires: libuv
 add_contrib (cassandra-cmake cassandra) # requires: libuv
-add_contrib (curl-cmake curl)
+
-add_contrib (azure-cmake azure)
+if (ENABLE_CURL_BUILD)
-add_contrib (sentry-native-cmake sentry-native) # requires: curl
+    add_contrib (curl-cmake curl)
+    add_contrib (azure-cmake azure)
+    add_contrib (sentry-native-cmake sentry-native) # requires: curl
+endif()
+
 add_contrib (fmtlib-cmake fmtlib)
 add_contrib (krb5-cmake krb5)
 add_contrib (cyrus-sasl-cmake cyrus-sasl) # for krb5
@@ -135,6 +140,7 @@ add_contrib (libpq-cmake libpq)
 add_contrib (nuraft-cmake NuRaft)
 add_contrib (fast_float-cmake fast_float)
 add_contrib (datasketches-cpp-cmake datasketches-cpp)
+add_contrib (hashidsxx-cmake hashidsxx)
 
 option(ENABLE_NLP "Enable NLP functions support" ${ENABLE_LIBRARIES})
 if (ENABLE_NLP)

contrib/NuRaft

@@ -1 +1 @@
-Subproject commit 1707a7572aa66ec5d0a2dbe2bf5effa3352e6b2d
+Subproject commit 24a13f15cf0838b93f3b1beb62ed010dffdb2117

contrib/arrow

@@ -1 +1 @@
-Subproject commit 1d9cc51daa4e7e9fc6926320ef73759818bd736e
+Subproject commit efdcd015cfdee1b6aa349c9ca227ca12c3d697f5

contrib/arrow-cmake/CMakeLists.txt

@@ -364,10 +364,8 @@ SET(ARROW_SRCS "${LIBRARY_DIR}/util/compression_snappy.cc" ${ARROW_SRCS})
 add_definitions(-DARROW_WITH_ZLIB)
 SET(ARROW_SRCS "${LIBRARY_DIR}/util/compression_zlib.cc" ${ARROW_SRCS})
 
-if (ARROW_WITH_ZSTD)
+add_definitions(-DARROW_WITH_ZSTD)
-    add_definitions(-DARROW_WITH_ZSTD)
+SET(ARROW_SRCS "${LIBRARY_DIR}/util/compression_zstd.cc" ${ARROW_SRCS})
-    SET(ARROW_SRCS "${LIBRARY_DIR}/util/compression_zstd.cc" ${ARROW_SRCS})
-endif ()
 
 
 add_library(_arrow ${ARROW_SRCS})
@@ -383,7 +381,6 @@ target_link_libraries(_arrow PRIVATE
     ch_contrib::snappy
     ch_contrib::zlib
     ch_contrib::zstd
-    ch_contrib::zstd
 )
 target_link_libraries(_arrow PUBLIC _orc)
 

contrib/avro-cmake/CMakeLists.txt

@@ -69,9 +69,10 @@ endif ()
 target_compile_options(_avrocpp PRIVATE ${SUPPRESS_WARNINGS})
 
 # create a symlink to include headers with <avro/...>
+set(AVRO_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/include")
 ADD_CUSTOM_TARGET(avro_symlink_headers ALL
-    COMMAND ${CMAKE_COMMAND} -E make_directory "${AVROCPP_ROOT_DIR}/include"
+    COMMAND ${CMAKE_COMMAND} -E make_directory "${AVRO_INCLUDE_DIR}"
-    COMMAND ${CMAKE_COMMAND} -E create_symlink "${AVROCPP_ROOT_DIR}/api" "${AVROCPP_ROOT_DIR}/include/avro"
+    COMMAND ${CMAKE_COMMAND} -E create_symlink "${AVROCPP_ROOT_DIR}/api" "${AVRO_INCLUDE_DIR}/avro"
 )
 add_dependencies(_avrocpp avro_symlink_headers)
-target_include_directories(_avrocpp SYSTEM BEFORE PUBLIC "${AVROCPP_ROOT_DIR}/include")
+target_include_directories(_avrocpp SYSTEM BEFORE PUBLIC "${AVRO_INCLUDE_DIR}")

contrib/base64-cmake/CMakeLists.txt

@@ -1,4 +1,4 @@
-if(ARCH_AMD64 OR ARCH_ARM)
+if(ARCH_AMD64 OR ARCH_AARCH64)
     option (ENABLE_BASE64 "Enable base64" ${ENABLE_LIBRARIES})
 elseif(ENABLE_BASE64)
     message (${RECONFIGURE_MESSAGE_LEVEL} "base64 library is only supported on x86_64 and aarch64")

contrib/boost-cmake/CMakeLists.txt

@@ -27,7 +27,11 @@ target_include_directories (_boost_headers_only SYSTEM BEFORE INTERFACE ${LIBRAR
 
 # asio
 
-target_compile_definitions (_boost_headers_only INTERFACE BOOST_ASIO_STANDALONE=1)
+target_compile_definitions (_boost_headers_only INTERFACE
+  BOOST_ASIO_STANDALONE=1
+  # Avoid using of deprecated in c++ > 17 std::result_of
+  BOOST_ASIO_HAS_STD_INVOKE_RESULT=1
+)
 
 # iostreams
 
@@ -110,7 +114,7 @@ if (SANITIZE AND (SANITIZE STREQUAL "address" OR SANITIZE STREQUAL "thread"))
             "${LIBRARY_DIR}/libs/context/src/continuation.cpp"
     )
 endif()
-if (ARCH_ARM)
+if (ARCH_AARCH64)
     set (SRCS_CONTEXT ${SRCS_CONTEXT}
         "${LIBRARY_DIR}/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S"
         "${LIBRARY_DIR}/libs/context/src/asm/make_arm64_aapcs_elf_gas.S"

contrib/boringssl

@@ -1 +1 @@
-Subproject commit c1e01a441d6db234f4f12e63a7657d1f9e6db9c1
+Subproject commit 9c0715ce459de443e7b08f270a518c1702f1a380

contrib/boringssl-cmake/CMakeLists.txt

@@ -154,12 +154,14 @@ set(
   ios-aarch64/crypto/fipsmodule/sha512-armv8.S
   ios-aarch64/crypto/fipsmodule/vpaes-armv8.S
   ios-aarch64/crypto/test/trampoline-armv8.S
+  ios-aarch64/crypto/third_party/sike/asm/fp-armv8.S
 )
 
 set(
   CRYPTO_ios_arm_SOURCES
 
   ios-arm/crypto/chacha/chacha-armv4.S
+  ios-arm/crypto/fipsmodule/aes-armv4.S
   ios-arm/crypto/fipsmodule/aesv8-armx32.S
   ios-arm/crypto/fipsmodule/armv4-mont.S
   ios-arm/crypto/fipsmodule/bsaes-armv7.S
@@ -185,12 +187,14 @@ set(
   linux-aarch64/crypto/fipsmodule/sha512-armv8.S
   linux-aarch64/crypto/fipsmodule/vpaes-armv8.S
   linux-aarch64/crypto/test/trampoline-armv8.S
+  linux-aarch64/crypto/third_party/sike/asm/fp-armv8.S
 )
 
 set(
   CRYPTO_linux_arm_SOURCES
 
   linux-arm/crypto/chacha/chacha-armv4.S
+  linux-arm/crypto/fipsmodule/aes-armv4.S
   linux-arm/crypto/fipsmodule/aesv8-armx32.S
   linux-arm/crypto/fipsmodule/armv4-mont.S
   linux-arm/crypto/fipsmodule/bsaes-armv7.S
@@ -210,13 +214,13 @@ set(
 
   linux-ppc64le/crypto/fipsmodule/aesp8-ppc.S
   linux-ppc64le/crypto/fipsmodule/ghashp8-ppc.S
-  linux-ppc64le/crypto/test/trampoline-ppc.S
 )
 
 set(
   CRYPTO_linux_x86_SOURCES
 
   linux-x86/crypto/chacha/chacha-x86.S
+  linux-x86/crypto/fipsmodule/aes-586.S
   linux-x86/crypto/fipsmodule/aesni-x86.S
   linux-x86/crypto/fipsmodule/bn-586.S
   linux-x86/crypto/fipsmodule/co-586.S
@@ -237,6 +241,7 @@ set(
   linux-x86_64/crypto/chacha/chacha-x86_64.S
   linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S
   linux-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.S
+  linux-x86_64/crypto/fipsmodule/aes-x86_64.S
   linux-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S
   linux-x86_64/crypto/fipsmodule/aesni-x86_64.S
   linux-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.S
@@ -253,6 +258,7 @@ set(
   linux-x86_64/crypto/fipsmodule/x86_64-mont.S
   linux-x86_64/crypto/fipsmodule/x86_64-mont5.S
   linux-x86_64/crypto/test/trampoline-x86_64.S
+  linux-x86_64/crypto/third_party/sike/asm/fp-x86_64.S
   "${BORINGSSL_SOURCE_DIR}/crypto/hrss/asm/poly_rq_mul.S"
 )
 
@@ -260,6 +266,7 @@ set(
   CRYPTO_mac_x86_SOURCES
 
   mac-x86/crypto/chacha/chacha-x86.S
+  mac-x86/crypto/fipsmodule/aes-586.S
   mac-x86/crypto/fipsmodule/aesni-x86.S
   mac-x86/crypto/fipsmodule/bn-586.S
   mac-x86/crypto/fipsmodule/co-586.S
@@ -280,6 +287,7 @@ set(
   mac-x86_64/crypto/chacha/chacha-x86_64.S
   mac-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S
   mac-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.S
+  mac-x86_64/crypto/fipsmodule/aes-x86_64.S
   mac-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S
   mac-x86_64/crypto/fipsmodule/aesni-x86_64.S
   mac-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.S
@@ -296,6 +304,7 @@ set(
   mac-x86_64/crypto/fipsmodule/x86_64-mont.S
   mac-x86_64/crypto/fipsmodule/x86_64-mont5.S
   mac-x86_64/crypto/test/trampoline-x86_64.S
+  mac-x86_64/crypto/third_party/sike/asm/fp-x86_64.S
 )
 
 set(
@@ -317,6 +326,7 @@ set(
   CRYPTO_win_x86_SOURCES
 
   win-x86/crypto/chacha/chacha-x86.asm
+  win-x86/crypto/fipsmodule/aes-586.asm
   win-x86/crypto/fipsmodule/aesni-x86.asm
   win-x86/crypto/fipsmodule/bn-586.asm
   win-x86/crypto/fipsmodule/co-586.asm
@@ -337,6 +347,7 @@ set(
   win-x86_64/crypto/chacha/chacha-x86_64.asm
   win-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.asm
   win-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.asm
+  win-x86_64/crypto/fipsmodule/aes-x86_64.asm
   win-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.asm
   win-x86_64/crypto/fipsmodule/aesni-x86_64.asm
   win-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.asm
@@ -353,6 +364,7 @@ set(
   win-x86_64/crypto/fipsmodule/x86_64-mont.asm
   win-x86_64/crypto/fipsmodule/x86_64-mont5.asm
   win-x86_64/crypto/test/trampoline-x86_64.asm
+  win-x86_64/crypto/third_party/sike/asm/fp-x86_64.asm
 )
 
 if(APPLE AND ARCH STREQUAL "aarch64")
@@ -384,7 +396,6 @@ add_library(
   "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_object.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_octet.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_print.c"
-  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_strex.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_strnid.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_time.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_type.c"
@@ -414,7 +425,6 @@ add_library(
   "${BORINGSSL_SOURCE_DIR}/crypto/bio/printf.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/bio/socket.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/bio/socket_helper.c"
-  "${BORINGSSL_SOURCE_DIR}/crypto/blake2/blake2.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/bn_extra/bn_asn1.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/bn_extra/convert.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/buf/buf.c"
@@ -439,22 +449,20 @@ add_library(
   "${BORINGSSL_SOURCE_DIR}/crypto/conf/conf.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/cpu-aarch64-fuchsia.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/cpu-aarch64-linux.c"
-  "${BORINGSSL_SOURCE_DIR}/crypto/cpu-aarch64-win.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/cpu-arm-linux.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/cpu-arm.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/cpu-intel.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/cpu-ppc64le.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/crypto.c"
-  "${BORINGSSL_SOURCE_DIR}/crypto/curve25519/curve25519.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/curve25519/spake25519.c"
-  "${BORINGSSL_SOURCE_DIR}/crypto/dh_extra/dh_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/dh/check.c"
-  "${BORINGSSL_SOURCE_DIR}/crypto/dh_extra/params.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/dh/dh.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/dh/dh_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/dh/params.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/digest_extra/digest_extra.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/dsa/dsa.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/dsa/dsa_asn1.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/ec_extra/ec_asn1.c"
-  "${BORINGSSL_SOURCE_DIR}/crypto/ec_extra/ec_derive.c"
-  "${BORINGSSL_SOURCE_DIR}/crypto/ec_extra/hash_to_curve.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/ecdh_extra/ecdh_extra.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/ecdsa_extra/ecdsa_asn1.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/engine/engine.c"
@@ -479,8 +487,8 @@ add_library(
   "${BORINGSSL_SOURCE_DIR}/crypto/ex_data.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/fipsmodule/bcm.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/fipsmodule/fips_shared_support.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/fipsmodule/is_fips.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/hkdf/hkdf.c"
-  "${BORINGSSL_SOURCE_DIR}/crypto/hpke/hpke.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/hrss/hrss.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/lhash/lhash.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/mem.c"
@@ -506,7 +514,6 @@ add_library(
   "${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/deterministic.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/forkunsafe.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/fuchsia.c"
-  "${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/passive.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/rand_extra.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/windows.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/rc4/rc4.c"
@@ -520,18 +527,15 @@ add_library(
   "${BORINGSSL_SOURCE_DIR}/crypto/thread_none.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/thread_pthread.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/thread_win.c"
-  "${BORINGSSL_SOURCE_DIR}/crypto/trust_token/pmbtoken.c"
-  "${BORINGSSL_SOURCE_DIR}/crypto/trust_token/trust_token.c"
-  "${BORINGSSL_SOURCE_DIR}/crypto/trust_token/voprf.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/a_digest.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/a_sign.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/a_strex.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/a_verify.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/algorithm.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/asn1_gen.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/by_dir.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/by_file.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/i2d_pr.c"
-  "${BORINGSSL_SOURCE_DIR}/crypto/x509/name_print.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/rsa_pss.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/t_crl.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/t_req.c"
@@ -597,11 +601,19 @@ add_library(
   "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pci.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pcia.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pcons.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pku.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pmaps.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_prn.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_purp.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_skey.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_sxnet.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_utl.c"
+  "${BORINGSSL_SOURCE_DIR}/third_party/fiat/curve25519.c"
+  "${BORINGSSL_SOURCE_DIR}/third_party/sike/asm/fp_generic.c"
+  "${BORINGSSL_SOURCE_DIR}/third_party/sike/curve_params.c"
+  "${BORINGSSL_SOURCE_DIR}/third_party/sike/fpx.c"
+  "${BORINGSSL_SOURCE_DIR}/third_party/sike/isogeny.c"
+  "${BORINGSSL_SOURCE_DIR}/third_party/sike/sike.c"
 )
 
 add_library(
@@ -614,8 +626,6 @@ add_library(
   "${BORINGSSL_SOURCE_DIR}/ssl/d1_srtp.cc"
   "${BORINGSSL_SOURCE_DIR}/ssl/dtls_method.cc"
   "${BORINGSSL_SOURCE_DIR}/ssl/dtls_record.cc"
-  "${BORINGSSL_SOURCE_DIR}/ssl/encrypted_client_hello.cc"
-  "${BORINGSSL_SOURCE_DIR}/ssl/extensions.cc"
   "${BORINGSSL_SOURCE_DIR}/ssl/handoff.cc"
   "${BORINGSSL_SOURCE_DIR}/ssl/handshake.cc"
   "${BORINGSSL_SOURCE_DIR}/ssl/handshake_client.cc"
@@ -638,6 +648,7 @@ add_library(
   "${BORINGSSL_SOURCE_DIR}/ssl/ssl_versions.cc"
   "${BORINGSSL_SOURCE_DIR}/ssl/ssl_x509.cc"
   "${BORINGSSL_SOURCE_DIR}/ssl/t1_enc.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/t1_lib.cc"
   "${BORINGSSL_SOURCE_DIR}/ssl/tls13_both.cc"
   "${BORINGSSL_SOURCE_DIR}/ssl/tls13_client.cc"
   "${BORINGSSL_SOURCE_DIR}/ssl/tls13_enc.cc"
@@ -658,9 +669,7 @@ add_executable(
   "${BORINGSSL_SOURCE_DIR}/tool/client.cc"
   "${BORINGSSL_SOURCE_DIR}/tool/const.cc"
   "${BORINGSSL_SOURCE_DIR}/tool/digest.cc"
-  "${BORINGSSL_SOURCE_DIR}/tool/fd.cc"
   "${BORINGSSL_SOURCE_DIR}/tool/file.cc"
-  "${BORINGSSL_SOURCE_DIR}/tool/generate_ech.cc"
   "${BORINGSSL_SOURCE_DIR}/tool/generate_ed25519.cc"
   "${BORINGSSL_SOURCE_DIR}/tool/genrsa.cc"
   "${BORINGSSL_SOURCE_DIR}/tool/pkcs12.cc"

contrib/boringssl-cmake/ios-aarch64/crypto/chacha/chacha-armv8.S

@@ -33,7 +33,6 @@ Lone:
 
 .align	5
 _ChaCha20_ctr32:
-	AARCH64_VALID_CALL_TARGET
 	cbz	x2,Labort
 #if __has_feature(hwaddress_sanitizer) && __clang_major__ >= 10
 	adrp	x5,:pg_hi21_nc:_OPENSSL_armcap_P
@@ -47,7 +46,6 @@ _ChaCha20_ctr32:
 	b.ne	ChaCha20_neon
 
 Lshort:
-	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
 
@@ -260,7 +258,6 @@ Loop:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
-	AARCH64_VALIDATE_LINK_REGISTER
 Labort:
 	ret
 
@@ -317,14 +314,12 @@ Loop_tail:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 
 
 
 .align	5
 ChaCha20_neon:
-	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
 
@@ -705,7 +700,6 @@ Loop_neon:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 
 Ltail_neon:
@@ -815,13 +809,11 @@ Ldone_neon:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 
 
 .align	5
 ChaCha20_512_neon:
-	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
 
@@ -1985,7 +1977,6 @@ Ldone_512_neon:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 
 #endif  // !OPENSSL_NO_ASM

contrib/boringssl-cmake/ios-aarch64/crypto/fipsmodule/aesv8-armx64.S

@@ -32,8 +32,6 @@ Lrcon:
 .align	5
 _aes_hw_set_encrypt_key:
 Lenc_key:
-	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
-	AARCH64_VALID_CALL_TARGET
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	mov	x3,#-1
@@ -202,7 +200,6 @@ Lenc_key_abort:
 
 .align	5
 _aes_hw_set_decrypt_key:
-	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	bl	Lenc_key
@@ -236,7 +233,6 @@ Loop_imc:
 	eor	x0,x0,x0		// return value
 Ldec_key_abort:
 	ldp	x29,x30,[sp],#16
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 
 .globl	_aes_hw_encrypt
@@ -244,7 +240,6 @@ Ldec_key_abort:
 
 .align	5
 _aes_hw_encrypt:
-	AARCH64_VALID_CALL_TARGET
 	ldr	w3,[x2,#240]
 	ld1	{v0.4s},[x2],#16
 	ld1	{v2.16b},[x0]
@@ -275,7 +270,6 @@ Loop_enc:
 
 .align	5
 _aes_hw_decrypt:
-	AARCH64_VALID_CALL_TARGET
 	ldr	w3,[x2,#240]
 	ld1	{v0.4s},[x2],#16
 	ld1	{v2.16b},[x0]
@@ -306,8 +300,6 @@ Loop_dec:
 
 .align	5
 _aes_hw_cbc_encrypt:
-	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
-	AARCH64_VALID_CALL_TARGET
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	subs	x2,x2,#16
@@ -599,8 +591,6 @@ Lcbc_abort:
 
 .align	5
 _aes_hw_ctr32_encrypt_blocks:
-	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
-	AARCH64_VALID_CALL_TARGET
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	ldr	w5,[x3,#240]

contrib/boringssl-cmake/ios-aarch64/crypto/fipsmodule/armv8-mont.S

@@ -12,8 +12,6 @@
 #if defined(BORINGSSL_PREFIX)
 #include <boringssl_prefix_symbols_asm.h>
 #endif
-#include <openssl/arm_arch.h>
-
 .text
 
 .globl	_bn_mul_mont
@@ -21,7 +19,6 @@
 
 .align	5
 _bn_mul_mont:
-	AARCH64_SIGN_LINK_REGISTER
 	tst	x5,#7
 	b.eq	__bn_sqr8x_mont
 	tst	x5,#3
@@ -219,14 +216,11 @@ Lcond_copy:
 	mov	x0,#1
 	ldp	x23,x24,[x29,#48]
 	ldr	x29,[sp],#64
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 
 
 .align	5
 __bn_sqr8x_mont:
-	// Not adding AARCH64_SIGN_LINK_REGISTER here because __bn_sqr8x_mont is jumped to
-	// only from bn_mul_mont which has already signed the return address.
 	cmp	x1,x2
 	b.ne	__bn_mul4x_mont
 Lsqr8x_mont:
@@ -980,16 +974,11 @@ Lsqr8x_done:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldr	x29,[sp],#128
-	// x30 is popped earlier
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 
 
 .align	5
 __bn_mul4x_mont:
-	// Not adding AARCH64_SIGN_LINK_REGISTER here because __bn_mul4x_mont is jumped to
-	// only from bn_mul_mont or __bn_mul8x_mont which have already signed the
-	// return address.
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -1423,8 +1412,6 @@ Lmul4x_done:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldr	x29,[sp],#128
-	// x30 is popped earlier
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 
 .byte	77,111,110,116,103,111,109,101,114,121,32,77,117,108,116,105,112,108,105,99,97,116,105,111,110,32,102,111,114,32,65,82,77,118,56,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0

contrib/boringssl-cmake/ios-aarch64/crypto/fipsmodule/ghash-neon-armv8.S

@@ -12,8 +12,6 @@
 #if defined(BORINGSSL_PREFIX)
 #include <boringssl_prefix_symbols_asm.h>
 #endif
-#include <openssl/arm_arch.h>
-
 .text
 
 .globl	_gcm_init_neon
@@ -21,7 +19,6 @@
 
 .align	4
 _gcm_init_neon:
-	AARCH64_VALID_CALL_TARGET
 	// This function is adapted from gcm_init_v8. xC2 is t3.
 	ld1	{v17.2d}, [x1]			// load H
 	movi	v19.16b, #0xe1
@@ -47,7 +44,6 @@ _gcm_init_neon:
 
 .align	4
 _gcm_gmult_neon:
-	AARCH64_VALID_CALL_TARGET
 	ld1	{v3.16b}, [x0]		// load Xi
 	ld1	{v5.1d}, [x1], #8		// load twisted H
 	ld1	{v6.1d}, [x1]
@@ -67,7 +63,6 @@ _gcm_gmult_neon:
 
 .align	4
 _gcm_ghash_neon:
-	AARCH64_VALID_CALL_TARGET
 	ld1	{v0.16b}, [x0]		// load Xi
 	ld1	{v5.1d}, [x1], #8		// load twisted H
 	ld1	{v6.1d}, [x1]

contrib/boringssl-cmake/ios-aarch64/crypto/fipsmodule/ghashv8-armx64.S

@@ -21,7 +21,6 @@
 
 .align	4
 _gcm_init_v8:
-	AARCH64_VALID_CALL_TARGET
 	ld1	{v17.2d},[x1]		//load input H
 	movi	v19.16b,#0xe1
 	shl	v19.2d,v19.2d,#57		//0xc2.0
@@ -73,7 +72,6 @@ _gcm_init_v8:
 
 .align	4
 _gcm_gmult_v8:
-	AARCH64_VALID_CALL_TARGET
 	ld1	{v17.2d},[x0]		//load Xi
 	movi	v19.16b,#0xe1
 	ld1	{v20.2d,v21.2d},[x1]	//load twisted H, ...
@@ -116,7 +114,6 @@ _gcm_gmult_v8:
 
 .align	4
 _gcm_ghash_v8:
-	AARCH64_VALID_CALL_TARGET
 	ld1	{v0.2d},[x0]		//load [rotated] Xi
 						//"[rotated]" means that
 						//loaded value would have

contrib/boringssl-cmake/ios-aarch64/crypto/fipsmodule/sha1-armv8.S

@@ -22,8 +22,6 @@
 
 .align	6
 _sha1_block_data_order:
-	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
-	AARCH64_VALID_CALL_TARGET
 #if __has_feature(hwaddress_sanitizer) && __clang_major__ >= 10
 	adrp	x16,:pg_hi21_nc:_OPENSSL_armcap_P
 #else
@@ -1091,8 +1089,6 @@ Loop:
 
 .align	6
 sha1_block_armv8:
-	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
-	AARCH64_VALID_CALL_TARGET
 Lv8_entry:
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0

contrib/boringssl-cmake/ios-aarch64/crypto/fipsmodule/sha256-armv8.S

@@ -63,7 +63,6 @@
 
 .align	6
 _sha256_block_data_order:
-	AARCH64_VALID_CALL_TARGET
 #ifndef	__KERNEL__
 #if __has_feature(hwaddress_sanitizer) && __clang_major__ >= 10
 	adrp	x16,:pg_hi21_nc:_OPENSSL_armcap_P
@@ -74,7 +73,6 @@ _sha256_block_data_order:
 	tst	w16,#ARMV8_SHA256
 	b.ne	Lv8_entry
 #endif
-	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
 
@@ -1035,7 +1033,6 @@ Loop_16_xx:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#128
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 
 
@@ -1070,7 +1067,6 @@ LK256:
 .align	6
 sha256_block_armv8:
 Lv8_entry:
-	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 

contrib/boringssl-cmake/ios-aarch64/crypto/fipsmodule/sha512-armv8.S

@@ -63,7 +63,6 @@
 
 .align	6
 _sha512_block_data_order:
-	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
 
@@ -1024,7 +1023,6 @@ Loop_16_xx:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#128
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 
 

contrib/boringssl-cmake/ios-aarch64/crypto/fipsmodule/vpaes-armv8.S

@@ -12,8 +12,6 @@
 #if defined(BORINGSSL_PREFIX)
 #include <boringssl_prefix_symbols_asm.h>
 #endif
-#include <openssl/arm_arch.h>
-
 .section	__TEXT,__const
 
 
@@ -216,7 +214,6 @@ Lenc_entry:
 
 .align	4
 _vpaes_encrypt:
-	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -226,7 +223,6 @@ _vpaes_encrypt:
 	st1	{v0.16b}, [x1]
 
 	ldp	x29,x30,[sp],#16
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 
 
@@ -455,7 +451,6 @@ Ldec_entry:
 
 .align	4
 _vpaes_decrypt:
-	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -465,7 +460,6 @@ _vpaes_decrypt:
 	st1	{v0.16b}, [x1]
 
 	ldp	x29,x30,[sp],#16
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 
 
@@ -635,7 +629,6 @@ _vpaes_key_preheat:
 
 .align	4
 _vpaes_schedule_core:
-	AARCH64_SIGN_LINK_REGISTER
 	stp	x29, x30, [sp,#-16]!
 	add	x29,sp,#0
 
@@ -805,7 +798,6 @@ Lschedule_mangle_last_dec:
 	eor	v6.16b, v6.16b, v6.16b		// vpxor	%xmm6,	%xmm6,	%xmm6
 	eor	v7.16b, v7.16b, v7.16b		// vpxor	%xmm7,	%xmm7,	%xmm7
 	ldp	x29, x30, [sp],#16
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 
 
@@ -1019,7 +1011,6 @@ Lschedule_mangle_both:
 
 .align	4
 _vpaes_set_encrypt_key:
-	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@@ -1035,7 +1026,6 @@ _vpaes_set_encrypt_key:
 
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 
 
@@ -1044,7 +1034,6 @@ _vpaes_set_encrypt_key:
 
 .align	4
 _vpaes_set_decrypt_key:
-	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@@ -1064,7 +1053,6 @@ _vpaes_set_decrypt_key:
 
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 
 .globl	_vpaes_cbc_encrypt
@@ -1072,7 +1060,6 @@ _vpaes_set_decrypt_key:
 
 .align	4
 _vpaes_cbc_encrypt:
-	AARCH64_SIGN_LINK_REGISTER
 	cbz	x2, Lcbc_abort
 	cmp	w5, #0			// check direction
 	b.eq	vpaes_cbc_decrypt
@@ -1099,7 +1086,6 @@ Lcbc_enc_loop:
 	st1	{v0.16b}, [x4]	// write ivec
 
 	ldp	x29,x30,[sp],#16
-	AARCH64_VALIDATE_LINK_REGISTER
 Lcbc_abort:
 	ret
 
@@ -1107,8 +1093,6 @@ Lcbc_abort:
 
 .align	4
 vpaes_cbc_decrypt:
-	// Not adding AARCH64_SIGN_LINK_REGISTER here because vpaes_cbc_decrypt is jumped to
-	// only from vpaes_cbc_encrypt which has already signed the return address.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@@ -1150,7 +1134,6 @@ Lcbc_dec_done:
 	ldp	d10,d11,[sp],#16
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 
 .globl	_vpaes_ctr32_encrypt_blocks
@@ -1158,7 +1141,6 @@ Lcbc_dec_done:
 
 .align	4
 _vpaes_ctr32_encrypt_blocks:
-	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@@ -1226,7 +1208,6 @@ Lctr32_done:
 	ldp	d10,d11,[sp],#16
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 
 #endif  // !OPENSSL_NO_ASM

contrib/boringssl-cmake/ios-aarch64/crypto/test/trampoline-armv8.S

@@ -12,8 +12,6 @@
 #if defined(BORINGSSL_PREFIX)
 #include <boringssl_prefix_symbols_asm.h>
 #endif
-#include <openssl/arm_arch.h>
-
 .text
 
 // abi_test_trampoline loads callee-saved registers from |state|, calls |func|
@@ -28,7 +26,6 @@
 .align	4
 _abi_test_trampoline:
 Labi_test_trampoline_begin:
-	AARCH64_SIGN_LINK_REGISTER
 	// Stack layout (low to high addresses)
 	//   x29,x30 (16 bytes)
 	//    d8-d15 (64 bytes)
@@ -131,7 +128,6 @@ Lx29_ok:
 	ldp	x27, x28, [sp, #144]
 
 	ldp	x29, x30, [sp], #176
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 
 
@@ -139,7 +135,6 @@ Lx29_ok:
 .private_extern	_abi_test_clobber_x0
 .align	4
 _abi_test_clobber_x0:
-	AARCH64_VALID_CALL_TARGET
 	mov	x0, xzr
 	ret
 
@@ -148,7 +143,6 @@ _abi_test_clobber_x0:
 .private_extern	_abi_test_clobber_x1
 .align	4
 _abi_test_clobber_x1:
-	AARCH64_VALID_CALL_TARGET
 	mov	x1, xzr
 	ret
 
@@ -157,7 +151,6 @@ _abi_test_clobber_x1:
 .private_extern	_abi_test_clobber_x2
 .align	4
 _abi_test_clobber_x2:
-	AARCH64_VALID_CALL_TARGET
 	mov	x2, xzr
 	ret
 
@@ -166,7 +159,6 @@ _abi_test_clobber_x2:
 .private_extern	_abi_test_clobber_x3
 .align	4
 _abi_test_clobber_x3:
-	AARCH64_VALID_CALL_TARGET
 	mov	x3, xzr
 	ret
 
@@ -175,7 +167,6 @@ _abi_test_clobber_x3:
 .private_extern	_abi_test_clobber_x4
 .align	4
 _abi_test_clobber_x4:
-	AARCH64_VALID_CALL_TARGET
 	mov	x4, xzr
 	ret
 
@@ -184,7 +175,6 @@ _abi_test_clobber_x4:
 .private_extern	_abi_test_clobber_x5
 .align	4
 _abi_test_clobber_x5:
-	AARCH64_VALID_CALL_TARGET
 	mov	x5, xzr
 	ret
 
@@ -193,7 +183,6 @@ _abi_test_clobber_x5:
 .private_extern	_abi_test_clobber_x6
 .align	4
 _abi_test_clobber_x6:
-	AARCH64_VALID_CALL_TARGET
 	mov	x6, xzr
 	ret
 
@@ -202,7 +191,6 @@ _abi_test_clobber_x6:
 .private_extern	_abi_test_clobber_x7
 .align	4
 _abi_test_clobber_x7:
-	AARCH64_VALID_CALL_TARGET
 	mov	x7, xzr
 	ret
 
@@ -211,7 +199,6 @@ _abi_test_clobber_x7:
 .private_extern	_abi_test_clobber_x8
 .align	4
 _abi_test_clobber_x8:
-	AARCH64_VALID_CALL_TARGET
 	mov	x8, xzr
 	ret
 
@@ -220,7 +207,6 @@ _abi_test_clobber_x8:
 .private_extern	_abi_test_clobber_x9
 .align	4
 _abi_test_clobber_x9:
-	AARCH64_VALID_CALL_TARGET
 	mov	x9, xzr
 	ret
 
@@ -229,7 +215,6 @@ _abi_test_clobber_x9:
 .private_extern	_abi_test_clobber_x10
 .align	4
 _abi_test_clobber_x10:
-	AARCH64_VALID_CALL_TARGET
 	mov	x10, xzr
 	ret
 
@@ -238,7 +223,6 @@ _abi_test_clobber_x10:
 .private_extern	_abi_test_clobber_x11
 .align	4
 _abi_test_clobber_x11:
-	AARCH64_VALID_CALL_TARGET
 	mov	x11, xzr
 	ret
 
@@ -247,7 +231,6 @@ _abi_test_clobber_x11:
 .private_extern	_abi_test_clobber_x12
 .align	4
 _abi_test_clobber_x12:
-	AARCH64_VALID_CALL_TARGET
 	mov	x12, xzr
 	ret
 
@@ -256,7 +239,6 @@ _abi_test_clobber_x12:
 .private_extern	_abi_test_clobber_x13
 .align	4
 _abi_test_clobber_x13:
-	AARCH64_VALID_CALL_TARGET
 	mov	x13, xzr
 	ret
 
@@ -265,7 +247,6 @@ _abi_test_clobber_x13:
 .private_extern	_abi_test_clobber_x14
 .align	4
 _abi_test_clobber_x14:
-	AARCH64_VALID_CALL_TARGET
 	mov	x14, xzr
 	ret
 
@@ -274,7 +255,6 @@ _abi_test_clobber_x14:
 .private_extern	_abi_test_clobber_x15
 .align	4
 _abi_test_clobber_x15:
-	AARCH64_VALID_CALL_TARGET
 	mov	x15, xzr
 	ret
 
@@ -283,7 +263,6 @@ _abi_test_clobber_x15:
 .private_extern	_abi_test_clobber_x16
 .align	4
 _abi_test_clobber_x16:
-	AARCH64_VALID_CALL_TARGET
 	mov	x16, xzr
 	ret
 
@@ -292,7 +271,6 @@ _abi_test_clobber_x16:
 .private_extern	_abi_test_clobber_x17
 .align	4
 _abi_test_clobber_x17:
-	AARCH64_VALID_CALL_TARGET
 	mov	x17, xzr
 	ret
 
@@ -301,7 +279,6 @@ _abi_test_clobber_x17:
 .private_extern	_abi_test_clobber_x19
 .align	4
 _abi_test_clobber_x19:
-	AARCH64_VALID_CALL_TARGET
 	mov	x19, xzr
 	ret
 
@@ -310,7 +287,6 @@ _abi_test_clobber_x19:
 .private_extern	_abi_test_clobber_x20
 .align	4
 _abi_test_clobber_x20:
-	AARCH64_VALID_CALL_TARGET
 	mov	x20, xzr
 	ret
 
@@ -319,7 +295,6 @@ _abi_test_clobber_x20:
 .private_extern	_abi_test_clobber_x21
 .align	4
 _abi_test_clobber_x21:
-	AARCH64_VALID_CALL_TARGET
 	mov	x21, xzr
 	ret
 
@@ -328,7 +303,6 @@ _abi_test_clobber_x21:
 .private_extern	_abi_test_clobber_x22
 .align	4
 _abi_test_clobber_x22:
-	AARCH64_VALID_CALL_TARGET
 	mov	x22, xzr
 	ret
 
@@ -337,7 +311,6 @@ _abi_test_clobber_x22:
 .private_extern	_abi_test_clobber_x23
 .align	4
 _abi_test_clobber_x23:
-	AARCH64_VALID_CALL_TARGET
 	mov	x23, xzr
 	ret
 
@@ -346,7 +319,6 @@ _abi_test_clobber_x23:
 .private_extern	_abi_test_clobber_x24
 .align	4
 _abi_test_clobber_x24:
-	AARCH64_VALID_CALL_TARGET
 	mov	x24, xzr
 	ret
 
@@ -355,7 +327,6 @@ _abi_test_clobber_x24:
 .private_extern	_abi_test_clobber_x25
 .align	4
 _abi_test_clobber_x25:
-	AARCH64_VALID_CALL_TARGET
 	mov	x25, xzr
 	ret
 
@@ -364,7 +335,6 @@ _abi_test_clobber_x25:
 .private_extern	_abi_test_clobber_x26
 .align	4
 _abi_test_clobber_x26:
-	AARCH64_VALID_CALL_TARGET
 	mov	x26, xzr
 	ret
 
@@ -373,7 +343,6 @@ _abi_test_clobber_x26:
 .private_extern	_abi_test_clobber_x27
 .align	4
 _abi_test_clobber_x27:
-	AARCH64_VALID_CALL_TARGET
 	mov	x27, xzr
 	ret
 
@@ -382,7 +351,6 @@ _abi_test_clobber_x27:
 .private_extern	_abi_test_clobber_x28
 .align	4
 _abi_test_clobber_x28:
-	AARCH64_VALID_CALL_TARGET
 	mov	x28, xzr
 	ret
 
@@ -391,7 +359,6 @@ _abi_test_clobber_x28:
 .private_extern	_abi_test_clobber_x29
 .align	4
 _abi_test_clobber_x29:
-	AARCH64_VALID_CALL_TARGET
 	mov	x29, xzr
 	ret
 
@@ -400,7 +367,6 @@ _abi_test_clobber_x29:
 .private_extern	_abi_test_clobber_d0
 .align	4
 _abi_test_clobber_d0:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d0, xzr
 	ret
 
@@ -409,7 +375,6 @@ _abi_test_clobber_d0:
 .private_extern	_abi_test_clobber_d1
 .align	4
 _abi_test_clobber_d1:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d1, xzr
 	ret
 
@@ -418,7 +383,6 @@ _abi_test_clobber_d1:
 .private_extern	_abi_test_clobber_d2
 .align	4
 _abi_test_clobber_d2:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d2, xzr
 	ret
 
@@ -427,7 +391,6 @@ _abi_test_clobber_d2:
 .private_extern	_abi_test_clobber_d3
 .align	4
 _abi_test_clobber_d3:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d3, xzr
 	ret
 
@@ -436,7 +399,6 @@ _abi_test_clobber_d3:
 .private_extern	_abi_test_clobber_d4
 .align	4
 _abi_test_clobber_d4:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d4, xzr
 	ret
 
@@ -445,7 +407,6 @@ _abi_test_clobber_d4:
 .private_extern	_abi_test_clobber_d5
 .align	4
 _abi_test_clobber_d5:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d5, xzr
 	ret
 
@@ -454,7 +415,6 @@ _abi_test_clobber_d5:
 .private_extern	_abi_test_clobber_d6
 .align	4
 _abi_test_clobber_d6:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d6, xzr
 	ret
 
@@ -463,7 +423,6 @@ _abi_test_clobber_d6:
 .private_extern	_abi_test_clobber_d7
 .align	4
 _abi_test_clobber_d7:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d7, xzr
 	ret
 
@@ -472,7 +431,6 @@ _abi_test_clobber_d7:
 .private_extern	_abi_test_clobber_d8
 .align	4
 _abi_test_clobber_d8:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d8, xzr
 	ret
 
@@ -481,7 +439,6 @@ _abi_test_clobber_d8:
 .private_extern	_abi_test_clobber_d9
 .align	4
 _abi_test_clobber_d9:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d9, xzr
 	ret
 
@@ -490,7 +447,6 @@ _abi_test_clobber_d9:
 .private_extern	_abi_test_clobber_d10
 .align	4
 _abi_test_clobber_d10:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d10, xzr
 	ret
 
@@ -499,7 +455,6 @@ _abi_test_clobber_d10:
 .private_extern	_abi_test_clobber_d11
 .align	4
 _abi_test_clobber_d11:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d11, xzr
 	ret
 
@@ -508,7 +463,6 @@ _abi_test_clobber_d11:
 .private_extern	_abi_test_clobber_d12
 .align	4
 _abi_test_clobber_d12:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d12, xzr
 	ret
 
@@ -517,7 +471,6 @@ _abi_test_clobber_d12:
 .private_extern	_abi_test_clobber_d13
 .align	4
 _abi_test_clobber_d13:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d13, xzr
 	ret
 
@@ -526,7 +479,6 @@ _abi_test_clobber_d13:
 .private_extern	_abi_test_clobber_d14
 .align	4
 _abi_test_clobber_d14:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d14, xzr
 	ret
 
@@ -535,7 +487,6 @@ _abi_test_clobber_d14:
 .private_extern	_abi_test_clobber_d15
 .align	4
 _abi_test_clobber_d15:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d15, xzr
 	ret
 
@@ -544,7 +495,6 @@ _abi_test_clobber_d15:
 .private_extern	_abi_test_clobber_d16
 .align	4
 _abi_test_clobber_d16:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d16, xzr
 	ret
 
@@ -553,7 +503,6 @@ _abi_test_clobber_d16:
 .private_extern	_abi_test_clobber_d17
 .align	4
 _abi_test_clobber_d17:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d17, xzr
 	ret
 
@@ -562,7 +511,6 @@ _abi_test_clobber_d17:
 .private_extern	_abi_test_clobber_d18
 .align	4
 _abi_test_clobber_d18:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d18, xzr
 	ret
 
@@ -571,7 +519,6 @@ _abi_test_clobber_d18:
 .private_extern	_abi_test_clobber_d19
 .align	4
 _abi_test_clobber_d19:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d19, xzr
 	ret
 
@@ -580,7 +527,6 @@ _abi_test_clobber_d19:
 .private_extern	_abi_test_clobber_d20
 .align	4
 _abi_test_clobber_d20:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d20, xzr
 	ret
 
@@ -589,7 +535,6 @@ _abi_test_clobber_d20:
 .private_extern	_abi_test_clobber_d21
 .align	4
 _abi_test_clobber_d21:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d21, xzr
 	ret
 
@@ -598,7 +543,6 @@ _abi_test_clobber_d21:
 .private_extern	_abi_test_clobber_d22
 .align	4
 _abi_test_clobber_d22:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d22, xzr
 	ret
 
@@ -607,7 +551,6 @@ _abi_test_clobber_d22:
 .private_extern	_abi_test_clobber_d23
 .align	4
 _abi_test_clobber_d23:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d23, xzr
 	ret
 
@@ -616,7 +559,6 @@ _abi_test_clobber_d23:
 .private_extern	_abi_test_clobber_d24
 .align	4
 _abi_test_clobber_d24:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d24, xzr
 	ret
 
@@ -625,7 +567,6 @@ _abi_test_clobber_d24:
 .private_extern	_abi_test_clobber_d25
 .align	4
 _abi_test_clobber_d25:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d25, xzr
 	ret
 
@@ -634,7 +575,6 @@ _abi_test_clobber_d25:
 .private_extern	_abi_test_clobber_d26
 .align	4
 _abi_test_clobber_d26:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d26, xzr
 	ret
 
@@ -643,7 +583,6 @@ _abi_test_clobber_d26:
 .private_extern	_abi_test_clobber_d27
 .align	4
 _abi_test_clobber_d27:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d27, xzr
 	ret
 
@@ -652,7 +591,6 @@ _abi_test_clobber_d27:
 .private_extern	_abi_test_clobber_d28
 .align	4
 _abi_test_clobber_d28:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d28, xzr
 	ret
 
@@ -661,7 +599,6 @@ _abi_test_clobber_d28:
 .private_extern	_abi_test_clobber_d29
 .align	4
 _abi_test_clobber_d29:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d29, xzr
 	ret
 
@@ -670,7 +607,6 @@ _abi_test_clobber_d29:
 .private_extern	_abi_test_clobber_d30
 .align	4
 _abi_test_clobber_d30:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d30, xzr
 	ret
 
@@ -679,7 +615,6 @@ _abi_test_clobber_d30:
 .private_extern	_abi_test_clobber_d31
 .align	4
 _abi_test_clobber_d31:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d31, xzr
 	ret
 
@@ -688,7 +623,6 @@ _abi_test_clobber_d31:
 .private_extern	_abi_test_clobber_v8_upper
 .align	4
 _abi_test_clobber_v8_upper:
-	AARCH64_VALID_CALL_TARGET
 	fmov	v8.d[1], xzr
 	ret
 
@@ -697,7 +631,6 @@ _abi_test_clobber_v8_upper:
 .private_extern	_abi_test_clobber_v9_upper
 .align	4
 _abi_test_clobber_v9_upper:
-	AARCH64_VALID_CALL_TARGET
 	fmov	v9.d[1], xzr
 	ret
 
@@ -706,7 +639,6 @@ _abi_test_clobber_v9_upper:
 .private_extern	_abi_test_clobber_v10_upper
 .align	4
 _abi_test_clobber_v10_upper:
-	AARCH64_VALID_CALL_TARGET
 	fmov	v10.d[1], xzr
 	ret
 
@@ -715,7 +647,6 @@ _abi_test_clobber_v10_upper:
 .private_extern	_abi_test_clobber_v11_upper
 .align	4
 _abi_test_clobber_v11_upper:
-	AARCH64_VALID_CALL_TARGET
 	fmov	v11.d[1], xzr
 	ret
 
@@ -724,7 +655,6 @@ _abi_test_clobber_v11_upper:
 .private_extern	_abi_test_clobber_v12_upper
 .align	4
 _abi_test_clobber_v12_upper:
-	AARCH64_VALID_CALL_TARGET
 	fmov	v12.d[1], xzr
 	ret
 
@@ -733,7 +663,6 @@ _abi_test_clobber_v12_upper:
 .private_extern	_abi_test_clobber_v13_upper
 .align	4
 _abi_test_clobber_v13_upper:
-	AARCH64_VALID_CALL_TARGET
 	fmov	v13.d[1], xzr
 	ret
 
@@ -742,7 +671,6 @@ _abi_test_clobber_v13_upper:
 .private_extern	_abi_test_clobber_v14_upper
 .align	4
 _abi_test_clobber_v14_upper:
-	AARCH64_VALID_CALL_TARGET
 	fmov	v14.d[1], xzr
 	ret
 
@@ -751,7 +679,6 @@ _abi_test_clobber_v14_upper:
 .private_extern	_abi_test_clobber_v15_upper
 .align	4
 _abi_test_clobber_v15_upper:
-	AARCH64_VALID_CALL_TARGET
 	fmov	v15.d[1], xzr
 	ret
 

contrib/boringssl-cmake/ios-aarch64/crypto/third_party/sike/asm/fp-armv8.S

@@ -0,0 +1,996 @@
+// This file is generated from a similarly-named Perl script in the BoringSSL
+// source tree. Do not edit by hand.
+
+#if !defined(__has_feature)
+#define __has_feature(x) 0
+#endif
+#if __has_feature(memory_sanitizer) && !defined(OPENSSL_NO_ASM)
+#define OPENSSL_NO_ASM
+#endif
+
+#if !defined(OPENSSL_NO_ASM)
+#if defined(BORINGSSL_PREFIX)
+#include <boringssl_prefix_symbols_asm.h>
+#endif
+.section	__TEXT,__const
+
+# p434 x 2
+Lp434x2:
+.quad	0xFFFFFFFFFFFFFFFE, 0xFFFFFFFFFFFFFFFF
+.quad	0xFB82ECF5C5FFFFFF, 0xF78CB8F062B15D47
+.quad	0xD9F8BFAD038A40AC, 0x0004683E4E2EE688
+
+# p434 + 1
+Lp434p1:
+.quad	0xFDC1767AE3000000, 0x7BC65C783158AEA3
+.quad	0x6CFC5FD681C52056, 0x0002341F27177344
+
+.text
+.globl	_sike_mpmul
+.private_extern	_sike_mpmul
+.align	4
+_sike_mpmul:
+	stp	x29, x30, [sp,#-96]!
+	add	x29, sp, #0
+	stp	x19, x20, [sp,#16]
+	stp	x21, x22, [sp,#32]
+	stp	x23, x24, [sp,#48]
+	stp	x25, x26, [sp,#64]
+	stp	x27, x28, [sp,#80]
+
+	ldp	x3,  x4, [x0]
+	ldp	x5,  x6, [x0,#16]
+	ldp	x7,  x8, [x0,#32]
+	ldr	x9,      [x0,#48]
+	ldp	x10, x11, [x1,#0]
+	ldp	x12, x13, [x1,#16]
+	ldp	x14, x15, [x1,#32]
+	ldr	x16,      [x1,#48]
+
+        // x3-x7 <- AH + AL, x7 <- carry
+	adds	x3, x3, x7
+	adcs	x4, x4, x8
+	adcs	x5, x5, x9
+	adcs	x6, x6, xzr
+	adc	x7, xzr, xzr
+
+        // x10-x13 <- BH + BL, x8 <- carry
+	adds	x10, x10, x14
+	adcs	x11, x11, x15
+	adcs	x12, x12, x16
+	adcs	x13, x13, xzr
+	adc	x8, xzr, xzr
+
+        // x9 <- combined carry
+	and	x9, x7, x8
+        // x7-x8 <- mask
+	sub	x7, xzr, x7
+	sub	x8, xzr, x8
+
+        // x15-x19 <- masked (BH + BL)
+	and	x14, x10, x7
+	and	x15, x11, x7
+	and	x16, x12, x7
+	and	x17, x13, x7
+
+        // x20-x23 <- masked (AH + AL)
+	and	x20, x3, x8
+	and	x21, x4, x8
+	and	x22, x5, x8
+	and	x23, x6, x8
+
+        // x15-x19, x7 <- masked (AH+AL) + masked (BH+BL), step 1
+	adds	x14, x14, x20
+	adcs	x15, x15, x21
+	adcs	x16, x16, x22
+	adcs	x17, x17, x23
+	adc	x7, x9, xzr
+
+        // x8-x9,x19,x20-x24 <- (AH+AL) x (BH+BL), low part
+	stp	x3, x4, [x2,#0]
+                // A0-A1 <- AH + AL, T0 <- mask
+	adds	x3, x3, x5
+	adcs	x4, x4, x6
+	adc	x25, xzr, xzr
+
+        // C6, T1 <- BH + BL, C7 <- mask
+	adds	x23, x10, x12
+	adcs	x26, x11, x13
+	adc	x24, xzr, xzr
+
+        // C0-C1 <- masked (BH + BL)
+	sub	x19, xzr, x25
+	sub	x20, xzr, x24
+	and	x8, x23, x19
+	and	x9, x26, x19
+
+        // C4-C5 <- masked (AH + AL), T0 <- combined carry
+	and	x21, x3, x20
+	and	x22, x4, x20
+	mul	x19, x3, x23
+	mul	x20, x3, x26
+	and	x25, x25, x24
+
+        // C0-C1, T0 <- (AH+AL) x (BH+BL), part 1
+	adds	x8, x21, x8
+	umulh	x21, x3, x26
+	adcs	x9, x22, x9
+	umulh	x22, x3, x23
+	adc	x25, x25, xzr
+
+        // C2-C5 <- (AH+AL) x (BH+BL), low part
+	mul	x3, x4, x23
+	umulh	x23, x4, x23
+	adds	x20, x20, x22
+	adc	x21, x21, xzr
+
+	mul	x24, x4, x26
+	umulh	x26, x4, x26
+	adds	x20, x20, x3
+	adcs	x21, x21, x23
+	adc	x22, xzr, xzr
+
+	adds	x21, x21, x24
+	adc	x22, x22, x26
+
+	ldp	x3, x4, [x2,#0]
+
+        // C2-C5, T0 <- (AH+AL) x (BH+BL), final part
+	adds	x21, x8, x21
+	umulh	x24, x3, x10
+	umulh	x26, x3, x11
+	adcs	x22, x9, x22
+	mul	x8, x3, x10
+	mul	x9, x3, x11
+	adc	x25, x25, xzr
+
+        // C0-C1, T1, C7 <- AL x BL
+	mul	x3, x4, x10
+	umulh	x10, x4, x10
+	adds	x9, x9, x24
+	adc	x26, x26, xzr
+
+	mul	x23, x4, x11
+	umulh	x11, x4, x11
+	adds	x9, x9, x3
+	adcs	x26, x26, x10
+	adc	x24, xzr, xzr
+
+	adds	x26, x26, x23
+	adc	x24, x24, x11
+
+
+        // C2-C5, T0 <- (AH+AL) x (BH+BL) - ALxBL
+	mul	x3, x5, x12
+	umulh	x10, x5, x12
+	subs	x19, x19, x8
+	sbcs	x20, x20, x9
+	sbcs	x21, x21, x26
+	mul	x4, x5, x13
+	umulh	x23, x5, x13
+	sbcs	x22, x22, x24
+	sbc	x25, x25, xzr
+
+        // A0, A1, C6, B0 <- AH x BH
+	mul	x5, x6, x12
+	umulh	x12, x6, x12
+	adds	x4, x4, x10
+	adc	x23, x23, xzr
+
+	mul	x11, x6, x13
+	umulh	x13, x6, x13
+	adds	x4, x4, x5
+	adcs	x23, x23, x12
+	adc	x10, xzr, xzr
+
+	adds	x23, x23, x11
+	adc	x10, x10, x13
+
+
+        // C2-C5, T0 <- (AH+AL) x (BH+BL) - ALxBL - AHxBH
+	subs	x19, x19, x3
+	sbcs	x20, x20, x4
+	sbcs	x21, x21, x23
+	sbcs	x22, x22, x10
+	sbc	x25, x25, xzr
+
+	adds	x19, x19, x26
+	adcs	x20, x20, x24
+	adcs	x21, x21, x3
+	adcs	x22, x22, x4
+	adcs	x23, x25, x23
+	adc	x24, x10, xzr
+
+
+        // x15-x19, x7 <- (AH+AL) x (BH+BL), final step
+	adds	x14, x14, x21
+	adcs	x15, x15, x22
+	adcs	x16, x16, x23
+	adcs	x17, x17, x24
+	adc	x7, x7, xzr
+
+        // Load AL
+	ldp	x3, x4, [x0]
+	ldp	x5, x6, [x0,#16]
+        // Load BL
+	ldp	x10, x11, [x1,#0]
+	ldp	x12, x13, [x1,#16]
+
+        // Temporarily store x8 in x2
+	stp	x8, x9, [x2,#0]
+        // x21-x28 <- AL x BL
+                // A0-A1 <- AH + AL, T0 <- mask
+	adds	x3, x3, x5
+	adcs	x4, x4, x6
+	adc	x8, xzr, xzr
+
+        // C6, T1 <- BH + BL, C7 <- mask
+	adds	x27, x10, x12
+	adcs	x9, x11, x13
+	adc	x28, xzr, xzr
+
+        // C0-C1 <- masked (BH + BL)
+	sub	x23, xzr, x8
+	sub	x24, xzr, x28
+	and	x21, x27, x23
+	and	x22, x9, x23
+
+        // C4-C5 <- masked (AH + AL), T0 <- combined carry
+	and	x25, x3, x24
+	and	x26, x4, x24
+	mul	x23, x3, x27
+	mul	x24, x3, x9
+	and	x8, x8, x28
+
+        // C0-C1, T0 <- (AH+AL) x (BH+BL), part 1
+	adds	x21, x25, x21
+	umulh	x25, x3, x9
+	adcs	x22, x26, x22
+	umulh	x26, x3, x27
+	adc	x8, x8, xzr
+
+        // C2-C5 <- (AH+AL) x (BH+BL), low part
+	mul	x3, x4, x27
+	umulh	x27, x4, x27
+	adds	x24, x24, x26
+	adc	x25, x25, xzr
+
+	mul	x28, x4, x9
+	umulh	x9, x4, x9
+	adds	x24, x24, x3
+	adcs	x25, x25, x27
+	adc	x26, xzr, xzr
+
+	adds	x25, x25, x28
+	adc	x26, x26, x9
+
+	ldp	x3, x4, [x0,#0]
+
+        // C2-C5, T0 <- (AH+AL) x (BH+BL), final part
+	adds	x25, x21, x25
+	umulh	x28, x3, x10
+	umulh	x9, x3, x11
+	adcs	x26, x22, x26
+	mul	x21, x3, x10
+	mul	x22, x3, x11
+	adc	x8, x8, xzr
+
+        // C0-C1, T1, C7 <- AL x BL
+	mul	x3, x4, x10
+	umulh	x10, x4, x10
+	adds	x22, x22, x28
+	adc	x9, x9, xzr
+
+	mul	x27, x4, x11
+	umulh	x11, x4, x11
+	adds	x22, x22, x3
+	adcs	x9, x9, x10
+	adc	x28, xzr, xzr
+
+	adds	x9, x9, x27
+	adc	x28, x28, x11
+
+
+        // C2-C5, T0 <- (AH+AL) x (BH+BL) - ALxBL
+	mul	x3, x5, x12
+	umulh	x10, x5, x12
+	subs	x23, x23, x21
+	sbcs	x24, x24, x22
+	sbcs	x25, x25, x9
+	mul	x4, x5, x13
+	umulh	x27, x5, x13
+	sbcs	x26, x26, x28
+	sbc	x8, x8, xzr
+
+        // A0, A1, C6, B0 <- AH x BH
+	mul	x5, x6, x12
+	umulh	x12, x6, x12
+	adds	x4, x4, x10
+	adc	x27, x27, xzr
+
+	mul	x11, x6, x13
+	umulh	x13, x6, x13
+	adds	x4, x4, x5
+	adcs	x27, x27, x12
+	adc	x10, xzr, xzr
+
+	adds	x27, x27, x11
+	adc	x10, x10, x13
+
+
+        // C2-C5, T0 <- (AH+AL) x (BH+BL) - ALxBL - AHxBH
+	subs	x23, x23, x3
+	sbcs	x24, x24, x4
+	sbcs	x25, x25, x27
+	sbcs	x26, x26, x10
+	sbc	x8, x8, xzr
+
+	adds	x23, x23, x9
+	adcs	x24, x24, x28
+	adcs	x25, x25, x3
+	adcs	x26, x26, x4
+	adcs	x27, x8, x27
+	adc	x28, x10, xzr
+
+        // Restore x8
+	ldp	x8, x9, [x2,#0]
+
+        // x8-x10,x20,x15-x17,x19 <- maskd (AH+AL) x (BH+BL) - ALxBL
+	subs	x8, x8, x21
+	sbcs	x9, x9, x22
+	sbcs	x19, x19, x23
+	sbcs	x20, x20, x24
+	sbcs	x14, x14, x25
+	sbcs	x15, x15, x26
+	sbcs	x16, x16, x27
+	sbcs	x17, x17, x28
+	sbc	x7, x7, xzr
+
+        // Store ALxBL, low
+	stp	x21, x22, [x2]
+	stp	x23, x24, [x2,#16]
+
+        // Load AH
+	ldp	x3, x4, [x0,#32]
+	ldr	x5,     [x0,#48]
+        // Load BH
+	ldp	x10, x11, [x1,#32]
+	ldr	x12,      [x1,#48]
+
+	adds	x8,  x8, x25
+	adcs	x9,  x9, x26
+	adcs	x19, x19, x27
+	adcs	x20, x20, x28
+	adc	x1, xzr, xzr
+
+	add	x0, x0, #32
+        // Temporarily store x8,x9 in x2
+	stp	x8,x9, [x2,#32]
+        // x21-x28 <- AH x BH
+
+        // A0 * B0
+	mul	x21, x3, x10  // C0
+	umulh	x24, x3, x10
+
+        // A0 * B1
+	mul	x22, x3, x11
+	umulh	x23, x3, x11
+
+        // A1 * B0
+	mul	x8, x4, x10
+	umulh	x9, x4, x10
+	adds	x22, x22, x24
+	adc	x23, x23, xzr
+
+        // A0 * B2
+	mul	x27, x3, x12
+	umulh	x28, x3, x12
+	adds	x22, x22, x8  // C1
+	adcs	x23, x23, x9
+	adc	x24, xzr, xzr
+
+        // A2 * B0
+	mul	x8, x5, x10
+	umulh	x25, x5, x10
+	adds	x23, x23, x27
+	adcs	x24, x24, x25
+	adc	x25, xzr, xzr
+
+        // A1 * B1
+	mul	x27, x4, x11
+	umulh	x9, x4, x11
+	adds	x23, x23, x8
+	adcs	x24, x24, x28
+	adc	x25, x25, xzr
+
+        // A1 * B2
+	mul	x8, x4, x12
+	umulh	x28, x4, x12
+	adds	x23, x23, x27 // C2
+	adcs	x24, x24, x9
+	adc	x25, x25, xzr
+
+        // A2 * B1
+	mul	x27, x5, x11
+	umulh	x9, x5, x11
+	adds	x24, x24, x8
+	adcs	x25, x25, x28
+	adc	x26, xzr, xzr
+
+        // A2 * B2
+	mul	x8, x5, x12
+	umulh	x28, x5, x12
+	adds	x24, x24, x27 // C3
+	adcs	x25, x25, x9
+	adc	x26, x26, xzr
+
+	adds	x25, x25, x8 // C4
+	adc	x26, x26, x28 // C5
+
+        // Restore x8,x9
+	ldp	x8,x9, [x2,#32]
+
+	neg	x1, x1
+
+        // x8-x9,x19,x20,x14-x17 <- (AH+AL) x (BH+BL) - ALxBL - AHxBH
+	subs	x8, x8, x21
+	sbcs	x9, x9, x22
+	sbcs	x19, x19, x23
+	sbcs	x20, x20, x24
+	sbcs	x14, x14, x25
+	sbcs	x15, x15, x26
+	sbcs	x16, x16, xzr
+	sbcs	x17, x17, xzr
+	sbc	x7, x7, xzr
+
+        // Store (AH+AL) x (BH+BL) - ALxBL - AHxBH, low
+	stp	x8,  x9, [x2,#32]
+	stp	x19, x20, [x2,#48]
+
+	adds	x1,  x1, #1
+	adcs	x14, x14, x21
+	adcs	x15, x15, x22
+	adcs	x16, x16, x23
+	adcs	x17, x17, x24
+	adcs	x25,  x7, x25
+	adc	x26, x26, xzr
+
+	stp	x14, x15, [x2,#64]
+	stp	x16, x17, [x2,#80]
+	stp	x25, x26, [x2,#96]
+
+	ldp	x19, x20, [x29,#16]
+	ldp	x21, x22, [x29,#32]
+	ldp	x23, x24, [x29,#48]
+	ldp	x25, x26, [x29,#64]
+	ldp	x27, x28, [x29,#80]
+	ldp	x29, x30, [sp],#96
+	ret
+.globl	_sike_fprdc
+.private_extern	_sike_fprdc
+.align	4
+_sike_fprdc:
+	stp	x29, x30, [sp, #-96]!
+	add	x29, sp, xzr
+	stp	x19, x20, [sp,#16]
+	stp	x21, x22, [sp,#32]
+	stp	x23, x24, [sp,#48]
+	stp	x25, x26, [sp,#64]
+	stp	x27, x28, [sp,#80]
+
+	ldp	x2, x3, [x0,#0]       // a[0-1]
+
+        // Load the prime constant
+	adrp	x26, Lp434p1@PAGE
+	add	x26, x26, Lp434p1@PAGEOFF
+	ldp	x23, x24, [x26, #0x0]
+	ldp	x25, x26, [x26,#0x10]
+
+        // a[0-1] * p434+1
+	mul	x4, x2, x23  // C0
+	umulh	x7, x2, x23
+
+	mul	x5, x2, x24
+	umulh	x6, x2, x24
+
+	mul	x10, x3, x23
+	umulh	x11, x3, x23
+	adds	x5, x5, x7
+	adc	x6, x6, xzr
+
+	mul	x27, x2, x25
+	umulh	x28, x2, x25
+	adds	x5, x5, x10  // C1
+	adcs	x6, x6, x11
+	adc	x7, xzr, xzr
+
+	mul	x10, x3, x24
+	umulh	x11, x3, x24
+	adds	x6, x6, x27
+	adcs	x7, x7, x28
+	adc	x8, xzr, xzr
+
+	mul	x27, x2, x26
+	umulh	x28, x2, x26
+	adds	x6, x6, x10  // C2
+	adcs	x7, x7, x11
+	adc	x8, x8, xzr
+
+	mul	x10, x3, x25
+	umulh	x11, x3, x25
+	adds	x7, x7, x27
+	adcs	x8, x8, x28
+	adc	x9, xzr, xzr
+
+	mul	x27, x3, x26
+	umulh	x28, x3, x26
+	adds	x7, x7, x10  // C3
+	adcs	x8, x8, x11
+	adc	x9, x9, xzr
+	adds	x8, x8, x27  // C4
+	adc	x9, x9, x28  // C5
+
+
+
+	ldp	x10, x11, [x0, #0x18]
+	ldp	x12, x13, [x0, #0x28]
+	ldp	x14, x15, [x0, #0x38]
+	ldp	x16, x17, [x0, #0x48]
+	ldp	x19, x20, [x0, #0x58]
+	ldr	x21,      [x0, #0x68]
+
+	adds	x10, x10, x4
+	adcs	x11, x11, x5
+	adcs	x12, x12, x6
+	adcs	x13, x13, x7
+	adcs	x14, x14, x8
+	adcs	x15, x15, x9
+	adcs	x22, x16, xzr
+	adcs	x17, x17, xzr
+	adcs	x19, x19, xzr
+	adcs	x20, x20, xzr
+	adc	x21, x21, xzr
+
+	ldr	x2,  [x0,#0x10]       // a[2]
+        // a[2-3] * p434+1
+	mul	x4, x2, x23  // C0
+	umulh	x7, x2, x23
+
+	mul	x5, x2, x24
+	umulh	x6, x2, x24
+
+	mul	x0, x10, x23
+	umulh	x3, x10, x23
+	adds	x5, x5, x7
+	adc	x6, x6, xzr
+
+	mul	x27, x2, x25
+	umulh	x28, x2, x25
+	adds	x5, x5, x0  // C1
+	adcs	x6, x6, x3
+	adc	x7, xzr, xzr
+
+	mul	x0, x10, x24
+	umulh	x3, x10, x24
+	adds	x6, x6, x27
+	adcs	x7, x7, x28
+	adc	x8, xzr, xzr
+
+	mul	x27, x2, x26
+	umulh	x28, x2, x26
+	adds	x6, x6, x0  // C2
+	adcs	x7, x7, x3
+	adc	x8, x8, xzr
+
+	mul	x0, x10, x25
+	umulh	x3, x10, x25
+	adds	x7, x7, x27
+	adcs	x8, x8, x28
+	adc	x9, xzr, xzr
+
+	mul	x27, x10, x26
+	umulh	x28, x10, x26
+	adds	x7, x7, x0  // C3
+	adcs	x8, x8, x3
+	adc	x9, x9, xzr
+	adds	x8, x8, x27  // C4
+	adc	x9, x9, x28  // C5
+
+
+
+	adds	x12, x12, x4
+	adcs	x13, x13, x5
+	adcs	x14, x14, x6
+	adcs	x15, x15, x7
+	adcs	x16, x22, x8
+	adcs	x17, x17, x9
+	adcs	x22, x19, xzr
+	adcs	x20, x20, xzr
+	adc	x21, x21, xzr
+
+	mul	x4, x11, x23  // C0
+	umulh	x7, x11, x23
+
+	mul	x5, x11, x24
+	umulh	x6, x11, x24
+
+	mul	x10, x12, x23
+	umulh	x3, x12, x23
+	adds	x5, x5, x7
+	adc	x6, x6, xzr
+
+	mul	x27, x11, x25
+	umulh	x28, x11, x25
+	adds	x5, x5, x10  // C1
+	adcs	x6, x6, x3
+	adc	x7, xzr, xzr
+
+	mul	x10, x12, x24
+	umulh	x3, x12, x24
+	adds	x6, x6, x27
+	adcs	x7, x7, x28
+	adc	x8, xzr, xzr
+
+	mul	x27, x11, x26
+	umulh	x28, x11, x26
+	adds	x6, x6, x10  // C2
+	adcs	x7, x7, x3
+	adc	x8, x8, xzr
+
+	mul	x10, x12, x25
+	umulh	x3, x12, x25
+	adds	x7, x7, x27
+	adcs	x8, x8, x28
+	adc	x9, xzr, xzr
+
+	mul	x27, x12, x26
+	umulh	x28, x12, x26
+	adds	x7, x7, x10  // C3
+	adcs	x8, x8, x3
+	adc	x9, x9, xzr
+	adds	x8, x8, x27  // C4
+	adc	x9, x9, x28  // C5
+
+
+	adds	x14, x14, x4
+	adcs	x15, x15, x5
+	adcs	x16, x16, x6
+	adcs	x17, x17, x7
+	adcs	x19, x22, x8
+	adcs	x20, x20, x9
+	adc	x22, x21, xzr
+
+	stp	x14, x15, [x1, #0x0]     // C0, C1
+
+	mul	x4, x13, x23    // C0
+	umulh	x10, x13, x23
+
+	mul	x5, x13, x24
+	umulh	x27, x13, x24
+	adds	x5, x5, x10    // C1
+	adc	x10, xzr, xzr
+
+	mul	x6, x13, x25
+	umulh	x28, x13, x25
+	adds	x27, x10, x27
+	adcs	x6, x6, x27    // C2
+	adc	x10, xzr, xzr
+
+	mul	x7, x13, x26
+	umulh	x8, x13, x26
+	adds	x28, x10, x28
+	adcs	x7, x7, x28    // C3
+	adc	x8, x8, xzr    // C4
+
+	adds	x16, x16, x4
+	adcs	x17, x17, x5
+	adcs	x19, x19, x6
+	adcs	x20, x20, x7
+	adc	x21, x22, x8
+
+	str	x16,       [x1, #0x10]
+	stp	x17, x19,  [x1, #0x18]
+	stp	x20, x21,  [x1, #0x28]
+
+	ldp	x19, x20, [x29,#16]
+	ldp	x21, x22, [x29,#32]
+	ldp	x23, x24, [x29,#48]
+	ldp	x25, x26, [x29,#64]
+	ldp	x27, x28, [x29,#80]
+	ldp	x29, x30, [sp],#96
+	ret
+.globl	_sike_fpadd
+.private_extern	_sike_fpadd
+.align	4
+_sike_fpadd:
+	stp	x29,x30, [sp,#-16]!
+	add	x29, sp, #0
+
+	ldp	x3, x4,   [x0,#0]
+	ldp	x5, x6,   [x0,#16]
+	ldp	x7, x8,   [x0,#32]
+	ldr	x9,       [x0,#48]
+	ldp	x11, x12, [x1,#0]
+	ldp	x13, x14, [x1,#16]
+	ldp	x15, x16, [x1,#32]
+	ldr	x17,      [x1,#48]
+
+        // Add a + b
+	adds	x3, x3, x11
+	adcs	x4, x4, x12
+	adcs	x5, x5, x13
+	adcs	x6, x6, x14
+	adcs	x7, x7, x15
+	adcs	x8, x8, x16
+	adc	x9, x9, x17
+
+        //  Subtract 2xp434
+	adrp	x17, Lp434x2@PAGE
+	add	x17, x17, Lp434x2@PAGEOFF
+	ldp	x11, x12, [x17, #0]
+	ldp	x13, x14, [x17, #16]
+	ldp	x15, x16, [x17, #32]
+	subs	x3, x3, x11
+	sbcs	x4, x4, x12
+	sbcs	x5, x5, x12
+	sbcs	x6, x6, x13
+	sbcs	x7, x7, x14
+	sbcs	x8, x8, x15
+	sbcs	x9, x9, x16
+	sbc	x0, xzr, xzr    // x0 can be reused now
+
+        // Add 2xp434 anded with the mask in x0
+	and	x11, x11, x0
+	and	x12, x12, x0
+	and	x13, x13, x0
+	and	x14, x14, x0
+	and	x15, x15, x0
+	and	x16, x16, x0
+
+	adds	x3, x3, x11
+	adcs	x4, x4, x12
+	adcs	x5, x5, x12
+	adcs	x6, x6, x13
+	adcs	x7, x7, x14
+	adcs	x8, x8, x15
+	adc	x9, x9, x16
+
+	stp	x3, x4,  [x2,#0]
+	stp	x5, x6,  [x2,#16]
+	stp	x7, x8,  [x2,#32]
+	str	x9,      [x2,#48]
+
+	ldp	x29, x30, [sp],#16
+	ret
+.globl	_sike_fpsub
+.private_extern	_sike_fpsub
+.align	4
+_sike_fpsub:
+	stp	x29, x30, [sp,#-16]!
+	add	x29, sp, #0
+
+	ldp	x3, x4,   [x0,#0]
+	ldp	x5, x6,   [x0,#16]
+	ldp	x7, x8,   [x0,#32]
+	ldr	x9,       [x0,#48]
+	ldp	x11, x12, [x1,#0]
+	ldp	x13, x14, [x1,#16]
+	ldp	x15, x16, [x1,#32]
+	ldr	x17,      [x1,#48]
+
+        // Subtract a - b
+	subs	x3, x3, x11
+	sbcs	x4, x4, x12
+	sbcs	x5, x5, x13
+	sbcs	x6, x6, x14
+	sbcs	x7, x7, x15
+	sbcs	x8, x8, x16
+	sbcs	x9, x9, x17
+	sbc	x0, xzr, xzr
+
+        // Add 2xp434 anded with the mask in x0
+	adrp	x17, Lp434x2@PAGE
+	add	x17, x17, Lp434x2@PAGEOFF
+
+        // First half
+	ldp	x11, x12, [x17, #0]
+	ldp	x13, x14, [x17, #16]
+	ldp	x15, x16, [x17, #32]
+
+        // Add 2xp434 anded with the mask in x0
+	and	x11, x11, x0
+	and	x12, x12, x0
+	and	x13, x13, x0
+	and	x14, x14, x0
+	and	x15, x15, x0
+	and	x16, x16, x0
+
+	adds	x3, x3, x11
+	adcs	x4, x4, x12
+	adcs	x5, x5, x12
+	adcs	x6, x6, x13
+	adcs	x7, x7, x14
+	adcs	x8, x8, x15
+	adc	x9, x9, x16
+
+	stp	x3, x4,  [x2,#0]
+	stp	x5, x6,  [x2,#16]
+	stp	x7, x8,  [x2,#32]
+	str	x9,      [x2,#48]
+
+	ldp	x29, x30, [sp],#16
+	ret
+.globl	_sike_mpadd_asm
+.private_extern	_sike_mpadd_asm
+.align	4
+_sike_mpadd_asm:
+	stp	x29, x30, [sp,#-16]!
+	add	x29, sp, #0
+
+	ldp	x3, x4,   [x0,#0]
+	ldp	x5, x6,   [x0,#16]
+	ldp	x7, x8,   [x0,#32]
+	ldr	x9,       [x0,#48]
+	ldp	x11, x12, [x1,#0]
+	ldp	x13, x14, [x1,#16]
+	ldp	x15, x16, [x1,#32]
+	ldr	x17,      [x1,#48]
+
+	adds	x3, x3, x11
+	adcs	x4, x4, x12
+	adcs	x5, x5, x13
+	adcs	x6, x6, x14
+	adcs	x7, x7, x15
+	adcs	x8, x8, x16
+	adc	x9, x9, x17
+
+	stp	x3, x4,   [x2,#0]
+	stp	x5, x6,   [x2,#16]
+	stp	x7, x8,   [x2,#32]
+	str	x9,       [x2,#48]
+
+	ldp	x29, x30, [sp],#16
+	ret
+.globl	_sike_mpsubx2_asm
+.private_extern	_sike_mpsubx2_asm
+.align	4
+_sike_mpsubx2_asm:
+	stp	x29, x30, [sp,#-16]!
+	add	x29, sp, #0
+
+	ldp	x3, x4,   [x0,#0]
+	ldp	x5, x6,   [x0,#16]
+	ldp	x11, x12, [x1,#0]
+	ldp	x13, x14, [x1,#16]
+	subs	x3, x3, x11
+	sbcs	x4, x4, x12
+	sbcs	x5, x5, x13
+	sbcs	x6, x6, x14
+	ldp	x7, x8,   [x0,#32]
+	ldp	x9, x10,  [x0,#48]
+	ldp	x11, x12, [x1,#32]
+	ldp	x13, x14, [x1,#48]
+	sbcs	x7, x7, x11
+	sbcs	x8, x8, x12
+	sbcs	x9, x9, x13
+	sbcs	x10, x10, x14
+
+	stp	x3, x4,   [x2,#0]
+	stp	x5, x6,   [x2,#16]
+	stp	x7, x8,   [x2,#32]
+	stp	x9, x10,  [x2,#48]
+
+	ldp	x3, x4,   [x0,#64]
+	ldp	x5, x6,   [x0,#80]
+	ldp	x11, x12, [x1,#64]
+	ldp	x13, x14, [x1,#80]
+	sbcs	x3, x3, x11
+	sbcs	x4, x4, x12
+	sbcs	x5, x5, x13
+	sbcs	x6, x6, x14
+	ldp	x7, x8,   [x0,#96]
+	ldp	x11, x12, [x1,#96]
+	sbcs	x7, x7, x11
+	sbcs	x8, x8, x12
+	sbc	x0, xzr, xzr
+
+	stp	x3, x4,   [x2,#64]
+	stp	x5, x6,   [x2,#80]
+	stp	x7, x8,   [x2,#96]
+
+	ldp	x29, x30, [sp],#16
+	ret
+.globl	_sike_mpdblsubx2_asm
+.private_extern	_sike_mpdblsubx2_asm
+.align	4
+_sike_mpdblsubx2_asm:
+	stp	x29, x30, [sp, #-16]!
+	add	x29, sp, #0
+
+	ldp	x3, x4,   [x2, #0]
+	ldp	x5, x6,   [x2,#16]
+	ldp	x7, x8,   [x2,#32]
+
+	ldp	x11, x12, [x0, #0]
+	ldp	x13, x14, [x0,#16]
+	ldp	x15, x16, [x0,#32]
+
+	subs	x3, x3, x11
+	sbcs	x4, x4, x12
+	sbcs	x5, x5, x13
+	sbcs	x6, x6, x14
+	sbcs	x7, x7, x15
+	sbcs	x8, x8, x16
+
+        // x9 stores carry
+	adc	x9, xzr, xzr
+
+	ldp	x11, x12, [x1, #0]
+	ldp	x13, x14, [x1,#16]
+	ldp	x15, x16, [x1,#32]
+	subs	x3, x3, x11
+	sbcs	x4, x4, x12
+	sbcs	x5, x5, x13
+	sbcs	x6, x6, x14
+	sbcs	x7, x7, x15
+	sbcs	x8, x8, x16
+	adc	x9, x9, xzr
+
+	stp	x3, x4,   [x2, #0]
+	stp	x5, x6,   [x2,#16]
+	stp	x7, x8,   [x2,#32]
+
+	ldp	x3, x4,   [x2,#48]
+	ldp	x5, x6,   [x2,#64]
+	ldp	x7, x8,   [x2,#80]
+
+	ldp	x11, x12, [x0,#48]
+	ldp	x13, x14, [x0,#64]
+	ldp	x15, x16, [x0,#80]
+
+        // x9 = 2 - x9
+	neg	x9, x9
+	add	x9, x9, #2
+
+	subs	x3, x3, x9
+	sbcs	x3, x3, x11
+	sbcs	x4, x4, x12
+	sbcs	x5, x5, x13
+	sbcs	x6, x6, x14
+	sbcs	x7, x7, x15
+	sbcs	x8, x8, x16
+	adc	x9, xzr, xzr
+
+	ldp	x11, x12, [x1,#48]
+	ldp	x13, x14, [x1,#64]
+	ldp	x15, x16, [x1,#80]
+	subs	x3, x3, x11
+	sbcs	x4, x4, x12
+	sbcs	x5, x5, x13
+	sbcs	x6, x6, x14
+	sbcs	x7, x7, x15
+	sbcs	x8, x8, x16
+	adc	x9, x9, xzr
+
+	stp	x3, x4,   [x2,#48]
+	stp	x5, x6,   [x2,#64]
+	stp	x7, x8,   [x2,#80]
+
+	ldp	x3,  x4, [x2,#96]
+	ldp	x11, x12, [x0,#96]
+	ldp	x13, x14, [x1,#96]
+
+        // x9 = 2 - x9
+	neg	x9, x9
+	add	x9, x9, #2
+
+	subs	x3, x3, x9
+	sbcs	x3, x3, x11
+	sbcs	x4, x4, x12
+	subs	x3, x3, x13
+	sbc	x4, x4, x14
+	stp	x3, x4,   [x2,#96]
+
+	ldp	x29, x30, [sp],#16
+	ret
+#endif  // !OPENSSL_NO_ASM

contrib/boringssl-cmake/ios-arm/crypto/fipsmodule/ghash-armv4.S

@@ -30,6 +30,348 @@
 #else
 .code	32
 #endif
+
+
+.align	5
+rem_4bit:
+.short	0x0000,0x1C20,0x3840,0x2460
+.short	0x7080,0x6CA0,0x48C0,0x54E0
+.short	0xE100,0xFD20,0xD940,0xC560
+.short	0x9180,0x8DA0,0xA9C0,0xB5E0
+
+
+#ifdef __thumb2__
+.thumb_func	rem_4bit_get
+#endif
+rem_4bit_get:
+#if defined(__thumb2__)
+	adr	r2,rem_4bit
+#else
+	sub	r2,pc,#8+32	@ &rem_4bit
+#endif
+	b	Lrem_4bit_got
+	nop
+	nop
+
+
+.globl	_gcm_ghash_4bit
+.private_extern	_gcm_ghash_4bit
+#ifdef __thumb2__
+.thumb_func	_gcm_ghash_4bit
+#endif
+.align	4
+_gcm_ghash_4bit:
+#if defined(__thumb2__)
+	adr	r12,rem_4bit
+#else
+	sub	r12,pc,#8+48		@ &rem_4bit
+#endif
+	add	r3,r2,r3		@ r3 to point at the end
+	stmdb	sp!,{r3,r4,r5,r6,r7,r8,r9,r10,r11,lr}		@ save r3/end too
+
+	ldmia	r12,{r4,r5,r6,r7,r8,r9,r10,r11}		@ copy rem_4bit ...
+	stmdb	sp!,{r4,r5,r6,r7,r8,r9,r10,r11}		@ ... to stack
+
+	ldrb	r12,[r2,#15]
+	ldrb	r14,[r0,#15]
+Louter:
+	eor	r12,r12,r14
+	and	r14,r12,#0xf0
+	and	r12,r12,#0x0f
+	mov	r3,#14
+
+	add	r7,r1,r12,lsl#4
+	ldmia	r7,{r4,r5,r6,r7}	@ load Htbl[nlo]
+	add	r11,r1,r14
+	ldrb	r12,[r2,#14]
+
+	and	r14,r4,#0xf		@ rem
+	ldmia	r11,{r8,r9,r10,r11}	@ load Htbl[nhi]
+	add	r14,r14,r14
+	eor	r4,r8,r4,lsr#4
+	ldrh	r8,[sp,r14]		@ rem_4bit[rem]
+	eor	r4,r4,r5,lsl#28
+	ldrb	r14,[r0,#14]
+	eor	r5,r9,r5,lsr#4
+	eor	r5,r5,r6,lsl#28
+	eor	r6,r10,r6,lsr#4
+	eor	r6,r6,r7,lsl#28
+	eor	r7,r11,r7,lsr#4
+	eor	r12,r12,r14
+	and	r14,r12,#0xf0
+	and	r12,r12,#0x0f
+	eor	r7,r7,r8,lsl#16
+
+Linner:
+	add	r11,r1,r12,lsl#4
+	and	r12,r4,#0xf		@ rem
+	subs	r3,r3,#1
+	add	r12,r12,r12
+	ldmia	r11,{r8,r9,r10,r11}	@ load Htbl[nlo]
+	eor	r4,r8,r4,lsr#4
+	eor	r4,r4,r5,lsl#28
+	eor	r5,r9,r5,lsr#4
+	eor	r5,r5,r6,lsl#28
+	ldrh	r8,[sp,r12]		@ rem_4bit[rem]
+	eor	r6,r10,r6,lsr#4
+#ifdef	__thumb2__
+	it	pl
+#endif
+	ldrplb	r12,[r2,r3]
+	eor	r6,r6,r7,lsl#28
+	eor	r7,r11,r7,lsr#4
+
+	add	r11,r1,r14
+	and	r14,r4,#0xf		@ rem
+	eor	r7,r7,r8,lsl#16	@ ^= rem_4bit[rem]
+	add	r14,r14,r14
+	ldmia	r11,{r8,r9,r10,r11}	@ load Htbl[nhi]
+	eor	r4,r8,r4,lsr#4
+#ifdef	__thumb2__
+	it	pl
+#endif
+	ldrplb	r8,[r0,r3]
+	eor	r4,r4,r5,lsl#28
+	eor	r5,r9,r5,lsr#4
+	ldrh	r9,[sp,r14]
+	eor	r5,r5,r6,lsl#28
+	eor	r6,r10,r6,lsr#4
+	eor	r6,r6,r7,lsl#28
+#ifdef	__thumb2__
+	it	pl
+#endif
+	eorpl	r12,r12,r8
+	eor	r7,r11,r7,lsr#4
+#ifdef	__thumb2__
+	itt	pl
+#endif
+	andpl	r14,r12,#0xf0
+	andpl	r12,r12,#0x0f
+	eor	r7,r7,r9,lsl#16	@ ^= rem_4bit[rem]
+	bpl	Linner
+
+	ldr	r3,[sp,#32]		@ re-load r3/end
+	add	r2,r2,#16
+	mov	r14,r4
+#if __ARM_ARCH__>=7 && defined(__ARMEL__)
+	rev	r4,r4
+	str	r4,[r0,#12]
+#elif defined(__ARMEB__)
+	str	r4,[r0,#12]
+#else
+	mov	r9,r4,lsr#8
+	strb	r4,[r0,#12+3]
+	mov	r10,r4,lsr#16
+	strb	r9,[r0,#12+2]
+	mov	r11,r4,lsr#24
+	strb	r10,[r0,#12+1]
+	strb	r11,[r0,#12]
+#endif
+	cmp	r2,r3
+#if __ARM_ARCH__>=7 && defined(__ARMEL__)
+	rev	r5,r5
+	str	r5,[r0,#8]
+#elif defined(__ARMEB__)
+	str	r5,[r0,#8]
+#else
+	mov	r9,r5,lsr#8
+	strb	r5,[r0,#8+3]
+	mov	r10,r5,lsr#16
+	strb	r9,[r0,#8+2]
+	mov	r11,r5,lsr#24
+	strb	r10,[r0,#8+1]
+	strb	r11,[r0,#8]
+#endif
+
+#ifdef __thumb2__
+	it	ne
+#endif
+	ldrneb	r12,[r2,#15]
+#if __ARM_ARCH__>=7 && defined(__ARMEL__)
+	rev	r6,r6
+	str	r6,[r0,#4]
+#elif defined(__ARMEB__)
+	str	r6,[r0,#4]
+#else
+	mov	r9,r6,lsr#8
+	strb	r6,[r0,#4+3]
+	mov	r10,r6,lsr#16
+	strb	r9,[r0,#4+2]
+	mov	r11,r6,lsr#24
+	strb	r10,[r0,#4+1]
+	strb	r11,[r0,#4]
+#endif
+
+#if __ARM_ARCH__>=7 && defined(__ARMEL__)
+	rev	r7,r7
+	str	r7,[r0,#0]
+#elif defined(__ARMEB__)
+	str	r7,[r0,#0]
+#else
+	mov	r9,r7,lsr#8
+	strb	r7,[r0,#0+3]
+	mov	r10,r7,lsr#16
+	strb	r9,[r0,#0+2]
+	mov	r11,r7,lsr#24
+	strb	r10,[r0,#0+1]
+	strb	r11,[r0,#0]
+#endif
+
+	bne	Louter
+
+	add	sp,sp,#36
+#if __ARM_ARCH__>=5
+	ldmia	sp!,{r4,r5,r6,r7,r8,r9,r10,r11,pc}
+#else
+	ldmia	sp!,{r4,r5,r6,r7,r8,r9,r10,r11,lr}
+	tst	lr,#1
+	moveq	pc,lr			@ be binary compatible with V4, yet
+.word	0xe12fff1e			@ interoperable with Thumb ISA:-)
+#endif
+
+
+.globl	_gcm_gmult_4bit
+.private_extern	_gcm_gmult_4bit
+#ifdef __thumb2__
+.thumb_func	_gcm_gmult_4bit
+#endif
+_gcm_gmult_4bit:
+	stmdb	sp!,{r4,r5,r6,r7,r8,r9,r10,r11,lr}
+	ldrb	r12,[r0,#15]
+	b	rem_4bit_get
+Lrem_4bit_got:
+	and	r14,r12,#0xf0
+	and	r12,r12,#0x0f
+	mov	r3,#14
+
+	add	r7,r1,r12,lsl#4
+	ldmia	r7,{r4,r5,r6,r7}	@ load Htbl[nlo]
+	ldrb	r12,[r0,#14]
+
+	add	r11,r1,r14
+	and	r14,r4,#0xf		@ rem
+	ldmia	r11,{r8,r9,r10,r11}	@ load Htbl[nhi]
+	add	r14,r14,r14
+	eor	r4,r8,r4,lsr#4
+	ldrh	r8,[r2,r14]	@ rem_4bit[rem]
+	eor	r4,r4,r5,lsl#28
+	eor	r5,r9,r5,lsr#4
+	eor	r5,r5,r6,lsl#28
+	eor	r6,r10,r6,lsr#4
+	eor	r6,r6,r7,lsl#28
+	eor	r7,r11,r7,lsr#4
+	and	r14,r12,#0xf0
+	eor	r7,r7,r8,lsl#16
+	and	r12,r12,#0x0f
+
+Loop:
+	add	r11,r1,r12,lsl#4
+	and	r12,r4,#0xf		@ rem
+	subs	r3,r3,#1
+	add	r12,r12,r12
+	ldmia	r11,{r8,r9,r10,r11}	@ load Htbl[nlo]
+	eor	r4,r8,r4,lsr#4
+	eor	r4,r4,r5,lsl#28
+	eor	r5,r9,r5,lsr#4
+	eor	r5,r5,r6,lsl#28
+	ldrh	r8,[r2,r12]	@ rem_4bit[rem]
+	eor	r6,r10,r6,lsr#4
+#ifdef	__thumb2__
+	it	pl
+#endif
+	ldrplb	r12,[r0,r3]
+	eor	r6,r6,r7,lsl#28
+	eor	r7,r11,r7,lsr#4
+
+	add	r11,r1,r14
+	and	r14,r4,#0xf		@ rem
+	eor	r7,r7,r8,lsl#16	@ ^= rem_4bit[rem]
+	add	r14,r14,r14
+	ldmia	r11,{r8,r9,r10,r11}	@ load Htbl[nhi]
+	eor	r4,r8,r4,lsr#4
+	eor	r4,r4,r5,lsl#28
+	eor	r5,r9,r5,lsr#4
+	ldrh	r8,[r2,r14]	@ rem_4bit[rem]
+	eor	r5,r5,r6,lsl#28
+	eor	r6,r10,r6,lsr#4
+	eor	r6,r6,r7,lsl#28
+	eor	r7,r11,r7,lsr#4
+#ifdef	__thumb2__
+	itt	pl
+#endif
+	andpl	r14,r12,#0xf0
+	andpl	r12,r12,#0x0f
+	eor	r7,r7,r8,lsl#16	@ ^= rem_4bit[rem]
+	bpl	Loop
+#if __ARM_ARCH__>=7 && defined(__ARMEL__)
+	rev	r4,r4
+	str	r4,[r0,#12]
+#elif defined(__ARMEB__)
+	str	r4,[r0,#12]
+#else
+	mov	r9,r4,lsr#8
+	strb	r4,[r0,#12+3]
+	mov	r10,r4,lsr#16
+	strb	r9,[r0,#12+2]
+	mov	r11,r4,lsr#24
+	strb	r10,[r0,#12+1]
+	strb	r11,[r0,#12]
+#endif
+
+#if __ARM_ARCH__>=7 && defined(__ARMEL__)
+	rev	r5,r5
+	str	r5,[r0,#8]
+#elif defined(__ARMEB__)
+	str	r5,[r0,#8]
+#else
+	mov	r9,r5,lsr#8
+	strb	r5,[r0,#8+3]
+	mov	r10,r5,lsr#16
+	strb	r9,[r0,#8+2]
+	mov	r11,r5,lsr#24
+	strb	r10,[r0,#8+1]
+	strb	r11,[r0,#8]
+#endif
+
+#if __ARM_ARCH__>=7 && defined(__ARMEL__)
+	rev	r6,r6
+	str	r6,[r0,#4]
+#elif defined(__ARMEB__)
+	str	r6,[r0,#4]
+#else
+	mov	r9,r6,lsr#8
+	strb	r6,[r0,#4+3]
+	mov	r10,r6,lsr#16
+	strb	r9,[r0,#4+2]
+	mov	r11,r6,lsr#24
+	strb	r10,[r0,#4+1]
+	strb	r11,[r0,#4]
+#endif
+
+#if __ARM_ARCH__>=7 && defined(__ARMEL__)
+	rev	r7,r7
+	str	r7,[r0,#0]
+#elif defined(__ARMEB__)
+	str	r7,[r0,#0]
+#else
+	mov	r9,r7,lsr#8
+	strb	r7,[r0,#0+3]
+	mov	r10,r7,lsr#16
+	strb	r9,[r0,#0+2]
+	mov	r11,r7,lsr#24
+	strb	r10,[r0,#0+1]
+	strb	r11,[r0,#0]
+#endif
+
+#if __ARM_ARCH__>=5
+	ldmia	sp!,{r4,r5,r6,r7,r8,r9,r10,r11,pc}
+#else
+	ldmia	sp!,{r4,r5,r6,r7,r8,r9,r10,r11,lr}
+	tst	lr,#1
+	moveq	pc,lr			@ be binary compatible with V4, yet
+.word	0xe12fff1e			@ interoperable with Thumb ISA:-)
+#endif
+
 #if __ARM_MAX_ARCH__>=7
 
 

contrib/boringssl-cmake/ios-arm/crypto/test/trampoline-armv4.S

@@ -30,6 +30,7 @@
 .private_extern	_abi_test_trampoline
 .align	4
 _abi_test_trampoline:
+Labi_test_trampoline_begin:
 	@ Save parameters and all callee-saved registers. For convenience, we
 	@ save r9 on iOS even though it's volatile.
 	vstmdb	sp!, {d8,d9,d10,d11,d12,d13,d14,d15}

contrib/boringssl-cmake/linux-aarch64/crypto/chacha/chacha-armv8.S

@@ -34,7 +34,6 @@
 .type	ChaCha20_ctr32,%function
 .align	5
 ChaCha20_ctr32:
-	AARCH64_VALID_CALL_TARGET
 	cbz	x2,.Labort
 #if __has_feature(hwaddress_sanitizer) && __clang_major__ >= 10
 	adrp	x5,:pg_hi21_nc:OPENSSL_armcap_P
@@ -48,7 +47,6 @@ ChaCha20_ctr32:
 	b.ne	ChaCha20_neon
 
 .Lshort:
-	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
 
@@ -261,7 +259,6 @@ ChaCha20_ctr32:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
-	AARCH64_VALIDATE_LINK_REGISTER
 .Labort:
 	ret
 
@@ -318,14 +315,12 @@ ChaCha20_ctr32:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ChaCha20_ctr32,.-ChaCha20_ctr32
 
 .type	ChaCha20_neon,%function
 .align	5
 ChaCha20_neon:
-	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
 
@@ -706,7 +701,6 @@ ChaCha20_neon:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 
 .Ltail_neon:
@@ -816,13 +810,11 @@ ChaCha20_neon:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ChaCha20_neon,.-ChaCha20_neon
 .type	ChaCha20_512_neon,%function
 .align	5
 ChaCha20_512_neon:
-	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
 
@@ -1986,9 +1978,7 @@ ChaCha20_512_neon:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ChaCha20_512_neon,.-ChaCha20_512_neon
 #endif
 #endif  // !OPENSSL_NO_ASM
-.section	.note.GNU-stack,"",%progbits

contrib/boringssl-cmake/linux-aarch64/crypto/fipsmodule/aesv8-armx64.S

@@ -33,8 +33,6 @@
 .align	5
 aes_hw_set_encrypt_key:
 .Lenc_key:
-	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
-	AARCH64_VALID_CALL_TARGET
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	mov	x3,#-1
@@ -203,7 +201,6 @@ aes_hw_set_encrypt_key:
 .type	aes_hw_set_decrypt_key,%function
 .align	5
 aes_hw_set_decrypt_key:
-	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	bl	.Lenc_key
@@ -237,7 +234,6 @@ aes_hw_set_decrypt_key:
 	eor	x0,x0,x0		// return value
 .Ldec_key_abort:
 	ldp	x29,x30,[sp],#16
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	aes_hw_set_decrypt_key,.-aes_hw_set_decrypt_key
 .globl	aes_hw_encrypt
@@ -245,7 +241,6 @@ aes_hw_set_decrypt_key:
 .type	aes_hw_encrypt,%function
 .align	5
 aes_hw_encrypt:
-	AARCH64_VALID_CALL_TARGET
 	ldr	w3,[x2,#240]
 	ld1	{v0.4s},[x2],#16
 	ld1	{v2.16b},[x0]
@@ -276,7 +271,6 @@ aes_hw_encrypt:
 .type	aes_hw_decrypt,%function
 .align	5
 aes_hw_decrypt:
-	AARCH64_VALID_CALL_TARGET
 	ldr	w3,[x2,#240]
 	ld1	{v0.4s},[x2],#16
 	ld1	{v2.16b},[x0]
@@ -307,8 +301,6 @@ aes_hw_decrypt:
 .type	aes_hw_cbc_encrypt,%function
 .align	5
 aes_hw_cbc_encrypt:
-	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
-	AARCH64_VALID_CALL_TARGET
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	subs	x2,x2,#16
@@ -600,8 +592,6 @@ aes_hw_cbc_encrypt:
 .type	aes_hw_ctr32_encrypt_blocks,%function
 .align	5
 aes_hw_ctr32_encrypt_blocks:
-	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
-	AARCH64_VALID_CALL_TARGET
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	ldr	w5,[x3,#240]
@@ -782,4 +772,3 @@ aes_hw_ctr32_encrypt_blocks:
 #endif
 #endif
 #endif  // !OPENSSL_NO_ASM
-.section	.note.GNU-stack,"",%progbits

contrib/boringssl-cmake/linux-aarch64/crypto/fipsmodule/armv8-mont.S

@@ -13,8 +13,6 @@
 #if defined(BORINGSSL_PREFIX)
 #include <boringssl_prefix_symbols_asm.h>
 #endif
-#include <openssl/arm_arch.h>
-
 .text
 
 .globl	bn_mul_mont
@@ -22,7 +20,6 @@
 .type	bn_mul_mont,%function
 .align	5
 bn_mul_mont:
-	AARCH64_SIGN_LINK_REGISTER
 	tst	x5,#7
 	b.eq	__bn_sqr8x_mont
 	tst	x5,#3
@@ -220,14 +217,11 @@ bn_mul_mont:
 	mov	x0,#1
 	ldp	x23,x24,[x29,#48]
 	ldr	x29,[sp],#64
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	bn_mul_mont,.-bn_mul_mont
 .type	__bn_sqr8x_mont,%function
 .align	5
 __bn_sqr8x_mont:
-	// Not adding AARCH64_SIGN_LINK_REGISTER here because __bn_sqr8x_mont is jumped to
-	// only from bn_mul_mont which has already signed the return address.
 	cmp	x1,x2
 	b.ne	__bn_mul4x_mont
 .Lsqr8x_mont:
@@ -981,16 +975,11 @@ __bn_sqr8x_mont:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldr	x29,[sp],#128
-	// x30 is popped earlier
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	__bn_sqr8x_mont,.-__bn_sqr8x_mont
 .type	__bn_mul4x_mont,%function
 .align	5
 __bn_mul4x_mont:
-	// Not adding AARCH64_SIGN_LINK_REGISTER here because __bn_mul4x_mont is jumped to
-	// only from bn_mul_mont or __bn_mul8x_mont which have already signed the
-	// return address.
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -1424,8 +1413,6 @@ __bn_mul4x_mont:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldr	x29,[sp],#128
-	// x30 is popped earlier
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	__bn_mul4x_mont,.-__bn_mul4x_mont
 .byte	77,111,110,116,103,111,109,101,114,121,32,77,117,108,116,105,112,108,105,99,97,116,105,111,110,32,102,111,114,32,65,82,77,118,56,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
@@ -1433,4 +1420,3 @@ __bn_mul4x_mont:
 .align	4
 #endif
 #endif  // !OPENSSL_NO_ASM
-.section	.note.GNU-stack,"",%progbits

contrib/boringssl-cmake/linux-aarch64/crypto/fipsmodule/ghash-neon-armv8.S

@@ -13,8 +13,6 @@
 #if defined(BORINGSSL_PREFIX)
 #include <boringssl_prefix_symbols_asm.h>
 #endif
-#include <openssl/arm_arch.h>
-
 .text
 
 .globl	gcm_init_neon
@@ -22,7 +20,6 @@
 .type	gcm_init_neon,%function
 .align	4
 gcm_init_neon:
-	AARCH64_VALID_CALL_TARGET
 	// This function is adapted from gcm_init_v8. xC2 is t3.
 	ld1	{v17.2d}, [x1]			// load H
 	movi	v19.16b, #0xe1
@@ -48,7 +45,6 @@ gcm_init_neon:
 .type	gcm_gmult_neon,%function
 .align	4
 gcm_gmult_neon:
-	AARCH64_VALID_CALL_TARGET
 	ld1	{v3.16b}, [x0]		// load Xi
 	ld1	{v5.1d}, [x1], #8		// load twisted H
 	ld1	{v6.1d}, [x1]
@@ -68,7 +64,6 @@ gcm_gmult_neon:
 .type	gcm_ghash_neon,%function
 .align	4
 gcm_ghash_neon:
-	AARCH64_VALID_CALL_TARGET
 	ld1	{v0.16b}, [x0]		// load Xi
 	ld1	{v5.1d}, [x1], #8		// load twisted H
 	ld1	{v6.1d}, [x1]
@@ -343,4 +338,3 @@ gcm_ghash_neon:
 .align	2
 #endif
 #endif  // !OPENSSL_NO_ASM
-.section	.note.GNU-stack,"",%progbits

contrib/boringssl-cmake/linux-aarch64/crypto/fipsmodule/ghashv8-armx64.S

@@ -22,7 +22,6 @@
 .type	gcm_init_v8,%function
 .align	4
 gcm_init_v8:
-	AARCH64_VALID_CALL_TARGET
 	ld1	{v17.2d},[x1]		//load input H
 	movi	v19.16b,#0xe1
 	shl	v19.2d,v19.2d,#57		//0xc2.0
@@ -74,7 +73,6 @@ gcm_init_v8:
 .type	gcm_gmult_v8,%function
 .align	4
 gcm_gmult_v8:
-	AARCH64_VALID_CALL_TARGET
 	ld1	{v17.2d},[x0]		//load Xi
 	movi	v19.16b,#0xe1
 	ld1	{v20.2d,v21.2d},[x1]	//load twisted H, ...
@@ -117,7 +115,6 @@ gcm_gmult_v8:
 .type	gcm_ghash_v8,%function
 .align	4
 gcm_ghash_v8:
-	AARCH64_VALID_CALL_TARGET
 	ld1	{v0.2d},[x0]		//load [rotated] Xi
 						//"[rotated]" means that
 						//loaded value would have
@@ -249,4 +246,3 @@ gcm_ghash_v8:
 .align	2
 #endif
 #endif  // !OPENSSL_NO_ASM
-.section	.note.GNU-stack,"",%progbits

contrib/boringssl-cmake/linux-aarch64/crypto/fipsmodule/sha1-armv8.S

@@ -23,8 +23,6 @@
 .type	sha1_block_data_order,%function
 .align	6
 sha1_block_data_order:
-	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
-	AARCH64_VALID_CALL_TARGET
 #if __has_feature(hwaddress_sanitizer) && __clang_major__ >= 10
 	adrp	x16,:pg_hi21_nc:OPENSSL_armcap_P
 #else
@@ -1092,8 +1090,6 @@ sha1_block_data_order:
 .type	sha1_block_armv8,%function
 .align	6
 sha1_block_armv8:
-	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
-	AARCH64_VALID_CALL_TARGET
 .Lv8_entry:
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
@@ -1236,4 +1232,3 @@ sha1_block_armv8:
 .hidden	OPENSSL_armcap_P
 #endif
 #endif  // !OPENSSL_NO_ASM
-.section	.note.GNU-stack,"",%progbits

contrib/boringssl-cmake/linux-aarch64/crypto/fipsmodule/sha256-armv8.S

@@ -64,7 +64,6 @@
 .type	sha256_block_data_order,%function
 .align	6
 sha256_block_data_order:
-	AARCH64_VALID_CALL_TARGET
 #ifndef	__KERNEL__
 #if __has_feature(hwaddress_sanitizer) && __clang_major__ >= 10
 	adrp	x16,:pg_hi21_nc:OPENSSL_armcap_P
@@ -75,7 +74,6 @@ sha256_block_data_order:
 	tst	w16,#ARMV8_SHA256
 	b.ne	.Lv8_entry
 #endif
-	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
 
@@ -1036,7 +1034,6 @@ sha256_block_data_order:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#128
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	sha256_block_data_order,.-sha256_block_data_order
 
@@ -1071,7 +1068,6 @@ sha256_block_data_order:
 .align	6
 sha256_block_armv8:
 .Lv8_entry:
-	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -1214,4 +1210,3 @@ sha256_block_armv8:
 #endif
 #endif
 #endif  // !OPENSSL_NO_ASM
-.section	.note.GNU-stack,"",%progbits

contrib/boringssl-cmake/linux-aarch64/crypto/fipsmodule/sha512-armv8.S

@@ -64,7 +64,6 @@
 .type	sha512_block_data_order,%function
 .align	6
 sha512_block_data_order:
-	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
 
@@ -1025,7 +1024,6 @@ sha512_block_data_order:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#128
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	sha512_block_data_order,.-sha512_block_data_order
 
@@ -1084,4 +1082,3 @@ sha512_block_data_order:
 #endif
 #endif
 #endif  // !OPENSSL_NO_ASM
-.section	.note.GNU-stack,"",%progbits

contrib/boringssl-cmake/linux-aarch64/crypto/fipsmodule/vpaes-armv8.S

@@ -13,8 +13,6 @@
 #if defined(BORINGSSL_PREFIX)
 #include <boringssl_prefix_symbols_asm.h>
 #endif
-#include <openssl/arm_arch.h>
-
 .section	.rodata
 
 .type	_vpaes_consts,%object
@@ -217,7 +215,6 @@ _vpaes_encrypt_core:
 .type	vpaes_encrypt,%function
 .align	4
 vpaes_encrypt:
-	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -227,7 +224,6 @@ vpaes_encrypt:
 	st1	{v0.16b}, [x1]
 
 	ldp	x29,x30,[sp],#16
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_encrypt,.-vpaes_encrypt
 
@@ -456,7 +452,6 @@ _vpaes_decrypt_core:
 .type	vpaes_decrypt,%function
 .align	4
 vpaes_decrypt:
-	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -466,7 +461,6 @@ vpaes_decrypt:
 	st1	{v0.16b}, [x1]
 
 	ldp	x29,x30,[sp],#16
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_decrypt,.-vpaes_decrypt
 
@@ -636,7 +630,6 @@ _vpaes_key_preheat:
 .type	_vpaes_schedule_core,%function
 .align	4
 _vpaes_schedule_core:
-	AARCH64_SIGN_LINK_REGISTER
 	stp	x29, x30, [sp,#-16]!
 	add	x29,sp,#0
 
@@ -806,7 +799,6 @@ _vpaes_schedule_core:
 	eor	v6.16b, v6.16b, v6.16b		// vpxor	%xmm6,	%xmm6,	%xmm6
 	eor	v7.16b, v7.16b, v7.16b		// vpxor	%xmm7,	%xmm7,	%xmm7
 	ldp	x29, x30, [sp],#16
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	_vpaes_schedule_core,.-_vpaes_schedule_core
 
@@ -1020,7 +1012,6 @@ _vpaes_schedule_mangle:
 .type	vpaes_set_encrypt_key,%function
 .align	4
 vpaes_set_encrypt_key:
-	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@@ -1036,7 +1027,6 @@ vpaes_set_encrypt_key:
 
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_set_encrypt_key,.-vpaes_set_encrypt_key
 
@@ -1045,7 +1035,6 @@ vpaes_set_encrypt_key:
 .type	vpaes_set_decrypt_key,%function
 .align	4
 vpaes_set_decrypt_key:
-	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@@ -1065,7 +1054,6 @@ vpaes_set_decrypt_key:
 
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_set_decrypt_key,.-vpaes_set_decrypt_key
 .globl	vpaes_cbc_encrypt
@@ -1073,7 +1061,6 @@ vpaes_set_decrypt_key:
 .type	vpaes_cbc_encrypt,%function
 .align	4
 vpaes_cbc_encrypt:
-	AARCH64_SIGN_LINK_REGISTER
 	cbz	x2, .Lcbc_abort
 	cmp	w5, #0			// check direction
 	b.eq	vpaes_cbc_decrypt
@@ -1100,7 +1087,6 @@ vpaes_cbc_encrypt:
 	st1	{v0.16b}, [x4]	// write ivec
 
 	ldp	x29,x30,[sp],#16
-	AARCH64_VALIDATE_LINK_REGISTER
 .Lcbc_abort:
 	ret
 .size	vpaes_cbc_encrypt,.-vpaes_cbc_encrypt
@@ -1108,8 +1094,6 @@ vpaes_cbc_encrypt:
 .type	vpaes_cbc_decrypt,%function
 .align	4
 vpaes_cbc_decrypt:
-	// Not adding AARCH64_SIGN_LINK_REGISTER here because vpaes_cbc_decrypt is jumped to
-	// only from vpaes_cbc_encrypt which has already signed the return address.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@@ -1151,7 +1135,6 @@ vpaes_cbc_decrypt:
 	ldp	d10,d11,[sp],#16
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_cbc_decrypt,.-vpaes_cbc_decrypt
 .globl	vpaes_ctr32_encrypt_blocks
@@ -1159,7 +1142,6 @@ vpaes_cbc_decrypt:
 .type	vpaes_ctr32_encrypt_blocks,%function
 .align	4
 vpaes_ctr32_encrypt_blocks:
-	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@@ -1227,9 +1209,7 @@ vpaes_ctr32_encrypt_blocks:
 	ldp	d10,d11,[sp],#16
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_ctr32_encrypt_blocks,.-vpaes_ctr32_encrypt_blocks
 #endif
 #endif  // !OPENSSL_NO_ASM
-.section	.note.GNU-stack,"",%progbits

contrib/boringssl-cmake/linux-aarch64/crypto/test/trampoline-armv8.S

@@ -13,8 +13,6 @@
 #if defined(BORINGSSL_PREFIX)
 #include <boringssl_prefix_symbols_asm.h>
 #endif
-#include <openssl/arm_arch.h>
-
 .text
 
 // abi_test_trampoline loads callee-saved registers from |state|, calls |func|
@@ -29,7 +27,6 @@
 .align	4
 abi_test_trampoline:
 .Labi_test_trampoline_begin:
-	AARCH64_SIGN_LINK_REGISTER
 	// Stack layout (low to high addresses)
 	//   x29,x30 (16 bytes)
 	//    d8-d15 (64 bytes)
@@ -132,7 +129,6 @@ abi_test_trampoline:
 	ldp	x27, x28, [sp, #144]
 
 	ldp	x29, x30, [sp], #176
-	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	abi_test_trampoline,.-abi_test_trampoline
 .type	abi_test_clobber_x0, %function
@@ -140,7 +136,6 @@ abi_test_trampoline:
 .hidden	abi_test_clobber_x0
 .align	4
 abi_test_clobber_x0:
-	AARCH64_VALID_CALL_TARGET
 	mov	x0, xzr
 	ret
 .size	abi_test_clobber_x0,.-abi_test_clobber_x0
@@ -149,7 +144,6 @@ abi_test_clobber_x0:
 .hidden	abi_test_clobber_x1
 .align	4
 abi_test_clobber_x1:
-	AARCH64_VALID_CALL_TARGET
 	mov	x1, xzr
 	ret
 .size	abi_test_clobber_x1,.-abi_test_clobber_x1
@@ -158,7 +152,6 @@ abi_test_clobber_x1:
 .hidden	abi_test_clobber_x2
 .align	4
 abi_test_clobber_x2:
-	AARCH64_VALID_CALL_TARGET
 	mov	x2, xzr
 	ret
 .size	abi_test_clobber_x2,.-abi_test_clobber_x2
@@ -167,7 +160,6 @@ abi_test_clobber_x2:
 .hidden	abi_test_clobber_x3
 .align	4
 abi_test_clobber_x3:
-	AARCH64_VALID_CALL_TARGET
 	mov	x3, xzr
 	ret
 .size	abi_test_clobber_x3,.-abi_test_clobber_x3
@@ -176,7 +168,6 @@ abi_test_clobber_x3:
 .hidden	abi_test_clobber_x4
 .align	4
 abi_test_clobber_x4:
-	AARCH64_VALID_CALL_TARGET
 	mov	x4, xzr
 	ret
 .size	abi_test_clobber_x4,.-abi_test_clobber_x4
@@ -185,7 +176,6 @@ abi_test_clobber_x4:
 .hidden	abi_test_clobber_x5
 .align	4
 abi_test_clobber_x5:
-	AARCH64_VALID_CALL_TARGET
 	mov	x5, xzr
 	ret
 .size	abi_test_clobber_x5,.-abi_test_clobber_x5
@@ -194,7 +184,6 @@ abi_test_clobber_x5:
 .hidden	abi_test_clobber_x6
 .align	4
 abi_test_clobber_x6:
-	AARCH64_VALID_CALL_TARGET
 	mov	x6, xzr
 	ret
 .size	abi_test_clobber_x6,.-abi_test_clobber_x6
@@ -203,7 +192,6 @@ abi_test_clobber_x6:
 .hidden	abi_test_clobber_x7
 .align	4
 abi_test_clobber_x7:
-	AARCH64_VALID_CALL_TARGET
 	mov	x7, xzr
 	ret
 .size	abi_test_clobber_x7,.-abi_test_clobber_x7
@@ -212,7 +200,6 @@ abi_test_clobber_x7:
 .hidden	abi_test_clobber_x8
 .align	4
 abi_test_clobber_x8:
-	AARCH64_VALID_CALL_TARGET
 	mov	x8, xzr
 	ret
 .size	abi_test_clobber_x8,.-abi_test_clobber_x8
@@ -221,7 +208,6 @@ abi_test_clobber_x8:
 .hidden	abi_test_clobber_x9
 .align	4
 abi_test_clobber_x9:
-	AARCH64_VALID_CALL_TARGET
 	mov	x9, xzr
 	ret
 .size	abi_test_clobber_x9,.-abi_test_clobber_x9
@@ -230,7 +216,6 @@ abi_test_clobber_x9:
 .hidden	abi_test_clobber_x10
 .align	4
 abi_test_clobber_x10:
-	AARCH64_VALID_CALL_TARGET
 	mov	x10, xzr
 	ret
 .size	abi_test_clobber_x10,.-abi_test_clobber_x10
@@ -239,7 +224,6 @@ abi_test_clobber_x10:
 .hidden	abi_test_clobber_x11
 .align	4
 abi_test_clobber_x11:
-	AARCH64_VALID_CALL_TARGET
 	mov	x11, xzr
 	ret
 .size	abi_test_clobber_x11,.-abi_test_clobber_x11
@@ -248,7 +232,6 @@ abi_test_clobber_x11:
 .hidden	abi_test_clobber_x12
 .align	4
 abi_test_clobber_x12:
-	AARCH64_VALID_CALL_TARGET
 	mov	x12, xzr
 	ret
 .size	abi_test_clobber_x12,.-abi_test_clobber_x12
@@ -257,7 +240,6 @@ abi_test_clobber_x12:
 .hidden	abi_test_clobber_x13
 .align	4
 abi_test_clobber_x13:
-	AARCH64_VALID_CALL_TARGET
 	mov	x13, xzr
 	ret
 .size	abi_test_clobber_x13,.-abi_test_clobber_x13
@@ -266,7 +248,6 @@ abi_test_clobber_x13:
 .hidden	abi_test_clobber_x14
 .align	4
 abi_test_clobber_x14:
-	AARCH64_VALID_CALL_TARGET
 	mov	x14, xzr
 	ret
 .size	abi_test_clobber_x14,.-abi_test_clobber_x14
@@ -275,7 +256,6 @@ abi_test_clobber_x14:
 .hidden	abi_test_clobber_x15
 .align	4
 abi_test_clobber_x15:
-	AARCH64_VALID_CALL_TARGET
 	mov	x15, xzr
 	ret
 .size	abi_test_clobber_x15,.-abi_test_clobber_x15
@@ -284,7 +264,6 @@ abi_test_clobber_x15:
 .hidden	abi_test_clobber_x16
 .align	4
 abi_test_clobber_x16:
-	AARCH64_VALID_CALL_TARGET
 	mov	x16, xzr
 	ret
 .size	abi_test_clobber_x16,.-abi_test_clobber_x16
@@ -293,7 +272,6 @@ abi_test_clobber_x16:
 .hidden	abi_test_clobber_x17
 .align	4
 abi_test_clobber_x17:
-	AARCH64_VALID_CALL_TARGET
 	mov	x17, xzr
 	ret
 .size	abi_test_clobber_x17,.-abi_test_clobber_x17
@@ -302,7 +280,6 @@ abi_test_clobber_x17:
 .hidden	abi_test_clobber_x19
 .align	4
 abi_test_clobber_x19:
-	AARCH64_VALID_CALL_TARGET
 	mov	x19, xzr
 	ret
 .size	abi_test_clobber_x19,.-abi_test_clobber_x19
@@ -311,7 +288,6 @@ abi_test_clobber_x19:
 .hidden	abi_test_clobber_x20
 .align	4
 abi_test_clobber_x20:
-	AARCH64_VALID_CALL_TARGET
 	mov	x20, xzr
 	ret
 .size	abi_test_clobber_x20,.-abi_test_clobber_x20
@@ -320,7 +296,6 @@ abi_test_clobber_x20:
 .hidden	abi_test_clobber_x21
 .align	4
 abi_test_clobber_x21:
-	AARCH64_VALID_CALL_TARGET
 	mov	x21, xzr
 	ret
 .size	abi_test_clobber_x21,.-abi_test_clobber_x21
@@ -329,7 +304,6 @@ abi_test_clobber_x21:
 .hidden	abi_test_clobber_x22
 .align	4
 abi_test_clobber_x22:
-	AARCH64_VALID_CALL_TARGET
 	mov	x22, xzr
 	ret
 .size	abi_test_clobber_x22,.-abi_test_clobber_x22
@@ -338,7 +312,6 @@ abi_test_clobber_x22:
 .hidden	abi_test_clobber_x23
 .align	4
 abi_test_clobber_x23:
-	AARCH64_VALID_CALL_TARGET
 	mov	x23, xzr
 	ret
 .size	abi_test_clobber_x23,.-abi_test_clobber_x23
@@ -347,7 +320,6 @@ abi_test_clobber_x23:
 .hidden	abi_test_clobber_x24
 .align	4
 abi_test_clobber_x24:
-	AARCH64_VALID_CALL_TARGET
 	mov	x24, xzr
 	ret
 .size	abi_test_clobber_x24,.-abi_test_clobber_x24
@@ -356,7 +328,6 @@ abi_test_clobber_x24:
 .hidden	abi_test_clobber_x25
 .align	4
 abi_test_clobber_x25:
-	AARCH64_VALID_CALL_TARGET
 	mov	x25, xzr
 	ret
 .size	abi_test_clobber_x25,.-abi_test_clobber_x25
@@ -365,7 +336,6 @@ abi_test_clobber_x25:
 .hidden	abi_test_clobber_x26
 .align	4
 abi_test_clobber_x26:
-	AARCH64_VALID_CALL_TARGET
 	mov	x26, xzr
 	ret
 .size	abi_test_clobber_x26,.-abi_test_clobber_x26
@@ -374,7 +344,6 @@ abi_test_clobber_x26:
 .hidden	abi_test_clobber_x27
 .align	4
 abi_test_clobber_x27:
-	AARCH64_VALID_CALL_TARGET
 	mov	x27, xzr
 	ret
 .size	abi_test_clobber_x27,.-abi_test_clobber_x27
@@ -383,7 +352,6 @@ abi_test_clobber_x27:
 .hidden	abi_test_clobber_x28
 .align	4
 abi_test_clobber_x28:
-	AARCH64_VALID_CALL_TARGET
 	mov	x28, xzr
 	ret
 .size	abi_test_clobber_x28,.-abi_test_clobber_x28
@@ -392,7 +360,6 @@ abi_test_clobber_x28:
 .hidden	abi_test_clobber_x29
 .align	4
 abi_test_clobber_x29:
-	AARCH64_VALID_CALL_TARGET
 	mov	x29, xzr
 	ret
 .size	abi_test_clobber_x29,.-abi_test_clobber_x29
@@ -401,7 +368,6 @@ abi_test_clobber_x29:
 .hidden	abi_test_clobber_d0
 .align	4
 abi_test_clobber_d0:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d0, xzr
 	ret
 .size	abi_test_clobber_d0,.-abi_test_clobber_d0
@@ -410,7 +376,6 @@ abi_test_clobber_d0:
 .hidden	abi_test_clobber_d1
 .align	4
 abi_test_clobber_d1:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d1, xzr
 	ret
 .size	abi_test_clobber_d1,.-abi_test_clobber_d1
@@ -419,7 +384,6 @@ abi_test_clobber_d1:
 .hidden	abi_test_clobber_d2
 .align	4
 abi_test_clobber_d2:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d2, xzr
 	ret
 .size	abi_test_clobber_d2,.-abi_test_clobber_d2
@@ -428,7 +392,6 @@ abi_test_clobber_d2:
 .hidden	abi_test_clobber_d3
 .align	4
 abi_test_clobber_d3:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d3, xzr
 	ret
 .size	abi_test_clobber_d3,.-abi_test_clobber_d3
@@ -437,7 +400,6 @@ abi_test_clobber_d3:
 .hidden	abi_test_clobber_d4
 .align	4
 abi_test_clobber_d4:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d4, xzr
 	ret
 .size	abi_test_clobber_d4,.-abi_test_clobber_d4
@@ -446,7 +408,6 @@ abi_test_clobber_d4:
 .hidden	abi_test_clobber_d5
 .align	4
 abi_test_clobber_d5:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d5, xzr
 	ret
 .size	abi_test_clobber_d5,.-abi_test_clobber_d5
@@ -455,7 +416,6 @@ abi_test_clobber_d5:
 .hidden	abi_test_clobber_d6
 .align	4
 abi_test_clobber_d6:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d6, xzr
 	ret
 .size	abi_test_clobber_d6,.-abi_test_clobber_d6
@@ -464,7 +424,6 @@ abi_test_clobber_d6:
 .hidden	abi_test_clobber_d7
 .align	4
 abi_test_clobber_d7:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d7, xzr
 	ret
 .size	abi_test_clobber_d7,.-abi_test_clobber_d7
@@ -473,7 +432,6 @@ abi_test_clobber_d7:
 .hidden	abi_test_clobber_d8
 .align	4
 abi_test_clobber_d8:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d8, xzr
 	ret
 .size	abi_test_clobber_d8,.-abi_test_clobber_d8
@@ -482,7 +440,6 @@ abi_test_clobber_d8:
 .hidden	abi_test_clobber_d9
 .align	4
 abi_test_clobber_d9:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d9, xzr
 	ret
 .size	abi_test_clobber_d9,.-abi_test_clobber_d9
@@ -491,7 +448,6 @@ abi_test_clobber_d9:
 .hidden	abi_test_clobber_d10
 .align	4
 abi_test_clobber_d10:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d10, xzr
 	ret
 .size	abi_test_clobber_d10,.-abi_test_clobber_d10
@@ -500,7 +456,6 @@ abi_test_clobber_d10:
 .hidden	abi_test_clobber_d11
 .align	4
 abi_test_clobber_d11:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d11, xzr
 	ret
 .size	abi_test_clobber_d11,.-abi_test_clobber_d11
@@ -509,7 +464,6 @@ abi_test_clobber_d11:
 .hidden	abi_test_clobber_d12
 .align	4
 abi_test_clobber_d12:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d12, xzr
 	ret
 .size	abi_test_clobber_d12,.-abi_test_clobber_d12
@@ -518,7 +472,6 @@ abi_test_clobber_d12:
 .hidden	abi_test_clobber_d13
 .align	4
 abi_test_clobber_d13:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d13, xzr
 	ret
 .size	abi_test_clobber_d13,.-abi_test_clobber_d13
@@ -527,7 +480,6 @@ abi_test_clobber_d13:
 .hidden	abi_test_clobber_d14
 .align	4
 abi_test_clobber_d14:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d14, xzr
 	ret
 .size	abi_test_clobber_d14,.-abi_test_clobber_d14
@@ -536,7 +488,6 @@ abi_test_clobber_d14:
 .hidden	abi_test_clobber_d15
 .align	4
 abi_test_clobber_d15:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d15, xzr
 	ret
 .size	abi_test_clobber_d15,.-abi_test_clobber_d15
@@ -545,7 +496,6 @@ abi_test_clobber_d15:
 .hidden	abi_test_clobber_d16
 .align	4
 abi_test_clobber_d16:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d16, xzr
 	ret
 .size	abi_test_clobber_d16,.-abi_test_clobber_d16
@@ -554,7 +504,6 @@ abi_test_clobber_d16:
 .hidden	abi_test_clobber_d17
 .align	4
 abi_test_clobber_d17:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d17, xzr
 	ret
 .size	abi_test_clobber_d17,.-abi_test_clobber_d17
@@ -563,7 +512,6 @@ abi_test_clobber_d17:
 .hidden	abi_test_clobber_d18
 .align	4
 abi_test_clobber_d18:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d18, xzr
 	ret
 .size	abi_test_clobber_d18,.-abi_test_clobber_d18
@@ -572,7 +520,6 @@ abi_test_clobber_d18:
 .hidden	abi_test_clobber_d19
 .align	4
 abi_test_clobber_d19:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d19, xzr
 	ret
 .size	abi_test_clobber_d19,.-abi_test_clobber_d19
@@ -581,7 +528,6 @@ abi_test_clobber_d19:
 .hidden	abi_test_clobber_d20
 .align	4
 abi_test_clobber_d20:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d20, xzr
 	ret
 .size	abi_test_clobber_d20,.-abi_test_clobber_d20
@@ -590,7 +536,6 @@ abi_test_clobber_d20:
 .hidden	abi_test_clobber_d21
 .align	4
 abi_test_clobber_d21:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d21, xzr
 	ret
 .size	abi_test_clobber_d21,.-abi_test_clobber_d21
@@ -599,7 +544,6 @@ abi_test_clobber_d21:
 .hidden	abi_test_clobber_d22
 .align	4
 abi_test_clobber_d22:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d22, xzr
 	ret
 .size	abi_test_clobber_d22,.-abi_test_clobber_d22
@@ -608,7 +552,6 @@ abi_test_clobber_d22:
 .hidden	abi_test_clobber_d23
 .align	4
 abi_test_clobber_d23:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d23, xzr
 	ret
 .size	abi_test_clobber_d23,.-abi_test_clobber_d23
@@ -617,7 +560,6 @@ abi_test_clobber_d23:
 .hidden	abi_test_clobber_d24
 .align	4
 abi_test_clobber_d24:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d24, xzr
 	ret
 .size	abi_test_clobber_d24,.-abi_test_clobber_d24
@@ -626,7 +568,6 @@ abi_test_clobber_d24:
 .hidden	abi_test_clobber_d25
 .align	4
 abi_test_clobber_d25:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d25, xzr
 	ret
 .size	abi_test_clobber_d25,.-abi_test_clobber_d25
@@ -635,7 +576,6 @@ abi_test_clobber_d25:
 .hidden	abi_test_clobber_d26
 .align	4
 abi_test_clobber_d26:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d26, xzr
 	ret
 .size	abi_test_clobber_d26,.-abi_test_clobber_d26
@@ -644,7 +584,6 @@ abi_test_clobber_d26:
 .hidden	abi_test_clobber_d27
 .align	4
 abi_test_clobber_d27:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d27, xzr
 	ret
 .size	abi_test_clobber_d27,.-abi_test_clobber_d27
@@ -653,7 +592,6 @@ abi_test_clobber_d27:
 .hidden	abi_test_clobber_d28
 .align	4
 abi_test_clobber_d28:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d28, xzr
 	ret
 .size	abi_test_clobber_d28,.-abi_test_clobber_d28
@@ -662,7 +600,6 @@ abi_test_clobber_d28:
 .hidden	abi_test_clobber_d29
 .align	4
 abi_test_clobber_d29:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d29, xzr
 	ret
 .size	abi_test_clobber_d29,.-abi_test_clobber_d29
@@ -671,7 +608,6 @@ abi_test_clobber_d29:
 .hidden	abi_test_clobber_d30
 .align	4
 abi_test_clobber_d30:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d30, xzr
 	ret
 .size	abi_test_clobber_d30,.-abi_test_clobber_d30
@@ -680,7 +616,6 @@ abi_test_clobber_d30:
 .hidden	abi_test_clobber_d31
 .align	4
 abi_test_clobber_d31:
-	AARCH64_VALID_CALL_TARGET
 	fmov	d31, xzr
 	ret
 .size	abi_test_clobber_d31,.-abi_test_clobber_d31
@@ -689,7 +624,6 @@ abi_test_clobber_d31:
 .hidden	abi_test_clobber_v8_upper
 .align	4
 abi_test_clobber_v8_upper:
-	AARCH64_VALID_CALL_TARGET
 	fmov	v8.d[1], xzr
 	ret
 .size	abi_test_clobber_v8_upper,.-abi_test_clobber_v8_upper
@@ -698,7 +632,6 @@ abi_test_clobber_v8_upper:
 .hidden	abi_test_clobber_v9_upper
 .align	4
 abi_test_clobber_v9_upper:
-	AARCH64_VALID_CALL_TARGET
 	fmov	v9.d[1], xzr
 	ret
 .size	abi_test_clobber_v9_upper,.-abi_test_clobber_v9_upper
@@ -707,7 +640,6 @@ abi_test_clobber_v9_upper:
 .hidden	abi_test_clobber_v10_upper
 .align	4
 abi_test_clobber_v10_upper:
-	AARCH64_VALID_CALL_TARGET
 	fmov	v10.d[1], xzr
 	ret
 .size	abi_test_clobber_v10_upper,.-abi_test_clobber_v10_upper
@@ -716,7 +648,6 @@ abi_test_clobber_v10_upper:
 .hidden	abi_test_clobber_v11_upper
 .align	4
 abi_test_clobber_v11_upper:
-	AARCH64_VALID_CALL_TARGET
 	fmov	v11.d[1], xzr
 	ret
 .size	abi_test_clobber_v11_upper,.-abi_test_clobber_v11_upper
@@ -725,7 +656,6 @@ abi_test_clobber_v11_upper:
 .hidden	abi_test_clobber_v12_upper
 .align	4
 abi_test_clobber_v12_upper:
-	AARCH64_VALID_CALL_TARGET
 	fmov	v12.d[1], xzr
 	ret
 .size	abi_test_clobber_v12_upper,.-abi_test_clobber_v12_upper
@@ -734,7 +664,6 @@ abi_test_clobber_v12_upper:
 .hidden	abi_test_clobber_v13_upper
 .align	4
 abi_test_clobber_v13_upper:
-	AARCH64_VALID_CALL_TARGET
 	fmov	v13.d[1], xzr
 	ret
 .size	abi_test_clobber_v13_upper,.-abi_test_clobber_v13_upper
@@ -743,7 +672,6 @@ abi_test_clobber_v13_upper:
 .hidden	abi_test_clobber_v14_upper
 .align	4
 abi_test_clobber_v14_upper:
-	AARCH64_VALID_CALL_TARGET
 	fmov	v14.d[1], xzr
 	ret
 .size	abi_test_clobber_v14_upper,.-abi_test_clobber_v14_upper
@@ -752,10 +680,8 @@ abi_test_clobber_v14_upper:
 .hidden	abi_test_clobber_v15_upper
 .align	4
 abi_test_clobber_v15_upper:
-	AARCH64_VALID_CALL_TARGET
 	fmov	v15.d[1], xzr
 	ret
 .size	abi_test_clobber_v15_upper,.-abi_test_clobber_v15_upper
 #endif
 #endif  // !OPENSSL_NO_ASM
-.section	.note.GNU-stack,"",%progbits

contrib/boringssl-cmake/linux-aarch64/crypto/third_party/sike/asm/fp-armv8.S

@@ -0,0 +1,998 @@
+// This file is generated from a similarly-named Perl script in the BoringSSL
+// source tree. Do not edit by hand.
+
+#if !defined(__has_feature)
+#define __has_feature(x) 0
+#endif
+#if __has_feature(memory_sanitizer) && !defined(OPENSSL_NO_ASM)
+#define OPENSSL_NO_ASM
+#endif
+
+#if !defined(OPENSSL_NO_ASM)
+#if defined(__aarch64__)
+#if defined(BORINGSSL_PREFIX)
+#include <boringssl_prefix_symbols_asm.h>
+#endif
+.section	.rodata
+
+# p434 x 2
+.Lp434x2:
+.quad	0xFFFFFFFFFFFFFFFE, 0xFFFFFFFFFFFFFFFF
+.quad	0xFB82ECF5C5FFFFFF, 0xF78CB8F062B15D47
+.quad	0xD9F8BFAD038A40AC, 0x0004683E4E2EE688
+
+# p434 + 1
+.Lp434p1:
+.quad	0xFDC1767AE3000000, 0x7BC65C783158AEA3
+.quad	0x6CFC5FD681C52056, 0x0002341F27177344
+
+.text
+.globl	sike_mpmul
+.hidden	sike_mpmul
+.align	4
+sike_mpmul:
+	stp	x29, x30, [sp,#-96]!
+	add	x29, sp, #0
+	stp	x19, x20, [sp,#16]
+	stp	x21, x22, [sp,#32]
+	stp	x23, x24, [sp,#48]
+	stp	x25, x26, [sp,#64]
+	stp	x27, x28, [sp,#80]
+
+	ldp	x3,  x4, [x0]
+	ldp	x5,  x6, [x0,#16]
+	ldp	x7,  x8, [x0,#32]
+	ldr	x9,      [x0,#48]
+	ldp	x10, x11, [x1,#0]
+	ldp	x12, x13, [x1,#16]
+	ldp	x14, x15, [x1,#32]
+	ldr	x16,      [x1,#48]
+
+        // x3-x7 <- AH + AL, x7 <- carry
+	adds	x3, x3, x7
+	adcs	x4, x4, x8
+	adcs	x5, x5, x9
+	adcs	x6, x6, xzr
+	adc	x7, xzr, xzr
+
+        // x10-x13 <- BH + BL, x8 <- carry
+	adds	x10, x10, x14
+	adcs	x11, x11, x15
+	adcs	x12, x12, x16
+	adcs	x13, x13, xzr
+	adc	x8, xzr, xzr
+
+        // x9 <- combined carry
+	and	x9, x7, x8
+        // x7-x8 <- mask
+	sub	x7, xzr, x7
+	sub	x8, xzr, x8
+
+        // x15-x19 <- masked (BH + BL)
+	and	x14, x10, x7
+	and	x15, x11, x7
+	and	x16, x12, x7
+	and	x17, x13, x7
+
+        // x20-x23 <- masked (AH + AL)
+	and	x20, x3, x8
+	and	x21, x4, x8
+	and	x22, x5, x8
+	and	x23, x6, x8
+
+        // x15-x19, x7 <- masked (AH+AL) + masked (BH+BL), step 1
+	adds	x14, x14, x20
+	adcs	x15, x15, x21
+	adcs	x16, x16, x22
+	adcs	x17, x17, x23
+	adc	x7, x9, xzr
+
+        // x8-x9,x19,x20-x24 <- (AH+AL) x (BH+BL), low part
+	stp	x3, x4, [x2,#0]
+                // A0-A1 <- AH + AL, T0 <- mask
+	adds	x3, x3, x5
+	adcs	x4, x4, x6
+	adc	x25, xzr, xzr
+
+        // C6, T1 <- BH + BL, C7 <- mask
+	adds	x23, x10, x12
+	adcs	x26, x11, x13
+	adc	x24, xzr, xzr
+
+        // C0-C1 <- masked (BH + BL)
+	sub	x19, xzr, x25
+	sub	x20, xzr, x24
+	and	x8, x23, x19
+	and	x9, x26, x19
+
+        // C4-C5 <- masked (AH + AL), T0 <- combined carry
+	and	x21, x3, x20
+	and	x22, x4, x20
+	mul	x19, x3, x23
+	mul	x20, x3, x26
+	and	x25, x25, x24
+
+        // C0-C1, T0 <- (AH+AL) x (BH+BL), part 1
+	adds	x8, x21, x8
+	umulh	x21, x3, x26
+	adcs	x9, x22, x9
+	umulh	x22, x3, x23
+	adc	x25, x25, xzr
+
+        // C2-C5 <- (AH+AL) x (BH+BL), low part
+	mul	x3, x4, x23
+	umulh	x23, x4, x23
+	adds	x20, x20, x22
+	adc	x21, x21, xzr
+
+	mul	x24, x4, x26
+	umulh	x26, x4, x26
+	adds	x20, x20, x3
+	adcs	x21, x21, x23
+	adc	x22, xzr, xzr
+
+	adds	x21, x21, x24
+	adc	x22, x22, x26
+
+	ldp	x3, x4, [x2,#0]
+
+        // C2-C5, T0 <- (AH+AL) x (BH+BL), final part
+	adds	x21, x8, x21
+	umulh	x24, x3, x10
+	umulh	x26, x3, x11
+	adcs	x22, x9, x22
+	mul	x8, x3, x10
+	mul	x9, x3, x11
+	adc	x25, x25, xzr
+
+        // C0-C1, T1, C7 <- AL x BL
+	mul	x3, x4, x10
+	umulh	x10, x4, x10
+	adds	x9, x9, x24
+	adc	x26, x26, xzr
+
+	mul	x23, x4, x11
+	umulh	x11, x4, x11
+	adds	x9, x9, x3
+	adcs	x26, x26, x10
+	adc	x24, xzr, xzr
+
+	adds	x26, x26, x23
+	adc	x24, x24, x11
+
+
+        // C2-C5, T0 <- (AH+AL) x (BH+BL) - ALxBL
+	mul	x3, x5, x12
+	umulh	x10, x5, x12
+	subs	x19, x19, x8
+	sbcs	x20, x20, x9
+	sbcs	x21, x21, x26
+	mul	x4, x5, x13
+	umulh	x23, x5, x13
+	sbcs	x22, x22, x24
+	sbc	x25, x25, xzr
+
+        // A0, A1, C6, B0 <- AH x BH
+	mul	x5, x6, x12
+	umulh	x12, x6, x12
+	adds	x4, x4, x10
+	adc	x23, x23, xzr
+
+	mul	x11, x6, x13
+	umulh	x13, x6, x13
+	adds	x4, x4, x5
+	adcs	x23, x23, x12
+	adc	x10, xzr, xzr
+
+	adds	x23, x23, x11
+	adc	x10, x10, x13
+
+
+        // C2-C5, T0 <- (AH+AL) x (BH+BL) - ALxBL - AHxBH
+	subs	x19, x19, x3
+	sbcs	x20, x20, x4
+	sbcs	x21, x21, x23
+	sbcs	x22, x22, x10
+	sbc	x25, x25, xzr
+
+	adds	x19, x19, x26
+	adcs	x20, x20, x24
+	adcs	x21, x21, x3
+	adcs	x22, x22, x4
+	adcs	x23, x25, x23
+	adc	x24, x10, xzr
+
+
+        // x15-x19, x7 <- (AH+AL) x (BH+BL), final step
+	adds	x14, x14, x21
+	adcs	x15, x15, x22
+	adcs	x16, x16, x23
+	adcs	x17, x17, x24
+	adc	x7, x7, xzr
+
+        // Load AL
+	ldp	x3, x4, [x0]
+	ldp	x5, x6, [x0,#16]
+        // Load BL
+	ldp	x10, x11, [x1,#0]
+	ldp	x12, x13, [x1,#16]
+
+        // Temporarily store x8 in x2
+	stp	x8, x9, [x2,#0]
+        // x21-x28 <- AL x BL
+                // A0-A1 <- AH + AL, T0 <- mask
+	adds	x3, x3, x5
+	adcs	x4, x4, x6
+	adc	x8, xzr, xzr
+
+        // C6, T1 <- BH + BL, C7 <- mask
+	adds	x27, x10, x12
+	adcs	x9, x11, x13
+	adc	x28, xzr, xzr
+
+        // C0-C1 <- masked (BH + BL)
+	sub	x23, xzr, x8
+	sub	x24, xzr, x28
+	and	x21, x27, x23
+	and	x22, x9, x23
+
+        // C4-C5 <- masked (AH + AL), T0 <- combined carry
+	and	x25, x3, x24
+	and	x26, x4, x24
+	mul	x23, x3, x27
+	mul	x24, x3, x9
+	and	x8, x8, x28
+
+        // C0-C1, T0 <- (AH+AL) x (BH+BL), part 1
+	adds	x21, x25, x21
+	umulh	x25, x3, x9
+	adcs	x22, x26, x22
+	umulh	x26, x3, x27
+	adc	x8, x8, xzr
+
+        // C2-C5 <- (AH+AL) x (BH+BL), low part
+	mul	x3, x4, x27
+	umulh	x27, x4, x27
+	adds	x24, x24, x26
+	adc	x25, x25, xzr
+
+	mul	x28, x4, x9
+	umulh	x9, x4, x9
+	adds	x24, x24, x3
+	adcs	x25, x25, x27
+	adc	x26, xzr, xzr
+
+	adds	x25, x25, x28
+	adc	x26, x26, x9
+
+	ldp	x3, x4, [x0,#0]
+
+        // C2-C5, T0 <- (AH+AL) x (BH+BL), final part
+	adds	x25, x21, x25
+	umulh	x28, x3, x10
+	umulh	x9, x3, x11
+	adcs	x26, x22, x26
+	mul	x21, x3, x10
+	mul	x22, x3, x11
+	adc	x8, x8, xzr
+
+        // C0-C1, T1, C7 <- AL x BL
+	mul	x3, x4, x10
+	umulh	x10, x4, x10
+	adds	x22, x22, x28
+	adc	x9, x9, xzr
+
+	mul	x27, x4, x11
+	umulh	x11, x4, x11
+	adds	x22, x22, x3
+	adcs	x9, x9, x10
+	adc	x28, xzr, xzr
+
+	adds	x9, x9, x27
+	adc	x28, x28, x11
+
+
+        // C2-C5, T0 <- (AH+AL) x (BH+BL) - ALxBL
+	mul	x3, x5, x12
+	umulh	x10, x5, x12
+	subs	x23, x23, x21
+	sbcs	x24, x24, x22
+	sbcs	x25, x25, x9
+	mul	x4, x5, x13
+	umulh	x27, x5, x13
+	sbcs	x26, x26, x28
+	sbc	x8, x8, xzr
+
+        // A0, A1, C6, B0 <- AH x BH
+	mul	x5, x6, x12
+	umulh	x12, x6, x12
+	adds	x4, x4, x10
+	adc	x27, x27, xzr
+
+	mul	x11, x6, x13
+	umulh	x13, x6, x13
+	adds	x4, x4, x5
+	adcs	x27, x27, x12
+	adc	x10, xzr, xzr
+
+	adds	x27, x27, x11
+	adc	x10, x10, x13
+
+
+        // C2-C5, T0 <- (AH+AL) x (BH+BL) - ALxBL - AHxBH
+	subs	x23, x23, x3
+	sbcs	x24, x24, x4
+	sbcs	x25, x25, x27
+	sbcs	x26, x26, x10
+	sbc	x8, x8, xzr
+
+	adds	x23, x23, x9
+	adcs	x24, x24, x28
+	adcs	x25, x25, x3
+	adcs	x26, x26, x4
+	adcs	x27, x8, x27
+	adc	x28, x10, xzr
+
+        // Restore x8
+	ldp	x8, x9, [x2,#0]
+
+        // x8-x10,x20,x15-x17,x19 <- maskd (AH+AL) x (BH+BL) - ALxBL
+	subs	x8, x8, x21
+	sbcs	x9, x9, x22
+	sbcs	x19, x19, x23
+	sbcs	x20, x20, x24
+	sbcs	x14, x14, x25
+	sbcs	x15, x15, x26
+	sbcs	x16, x16, x27
+	sbcs	x17, x17, x28
+	sbc	x7, x7, xzr
+
+        // Store ALxBL, low
+	stp	x21, x22, [x2]
+	stp	x23, x24, [x2,#16]
+
+        // Load AH
+	ldp	x3, x4, [x0,#32]
+	ldr	x5,     [x0,#48]
+        // Load BH
+	ldp	x10, x11, [x1,#32]
+	ldr	x12,      [x1,#48]
+
+	adds	x8,  x8, x25
+	adcs	x9,  x9, x26
+	adcs	x19, x19, x27
+	adcs	x20, x20, x28
+	adc	x1, xzr, xzr
+
+	add	x0, x0, #32
+        // Temporarily store x8,x9 in x2
+	stp	x8,x9, [x2,#32]
+        // x21-x28 <- AH x BH
+
+        // A0 * B0
+	mul	x21, x3, x10  // C0
+	umulh	x24, x3, x10
+
+        // A0 * B1
+	mul	x22, x3, x11
+	umulh	x23, x3, x11
+
+        // A1 * B0
+	mul	x8, x4, x10
+	umulh	x9, x4, x10
+	adds	x22, x22, x24
+	adc	x23, x23, xzr
+
+        // A0 * B2
+	mul	x27, x3, x12
+	umulh	x28, x3, x12
+	adds	x22, x22, x8  // C1
+	adcs	x23, x23, x9
+	adc	x24, xzr, xzr
+
+        // A2 * B0
+	mul	x8, x5, x10
+	umulh	x25, x5, x10
+	adds	x23, x23, x27
+	adcs	x24, x24, x25
+	adc	x25, xzr, xzr
+
+        // A1 * B1
+	mul	x27, x4, x11
+	umulh	x9, x4, x11
+	adds	x23, x23, x8
+	adcs	x24, x24, x28
+	adc	x25, x25, xzr
+
+        // A1 * B2
+	mul	x8, x4, x12
+	umulh	x28, x4, x12
+	adds	x23, x23, x27 // C2
+	adcs	x24, x24, x9
+	adc	x25, x25, xzr
+
+        // A2 * B1
+	mul	x27, x5, x11
+	umulh	x9, x5, x11
+	adds	x24, x24, x8
+	adcs	x25, x25, x28
+	adc	x26, xzr, xzr
+
+        // A2 * B2
+	mul	x8, x5, x12
+	umulh	x28, x5, x12
+	adds	x24, x24, x27 // C3
+	adcs	x25, x25, x9
+	adc	x26, x26, xzr
+
+	adds	x25, x25, x8 // C4
+	adc	x26, x26, x28 // C5
+
+        // Restore x8,x9
+	ldp	x8,x9, [x2,#32]
+
+	neg	x1, x1
+
+        // x8-x9,x19,x20,x14-x17 <- (AH+AL) x (BH+BL) - ALxBL - AHxBH
+	subs	x8, x8, x21
+	sbcs	x9, x9, x22
+	sbcs	x19, x19, x23
+	sbcs	x20, x20, x24
+	sbcs	x14, x14, x25
+	sbcs	x15, x15, x26
+	sbcs	x16, x16, xzr
+	sbcs	x17, x17, xzr
+	sbc	x7, x7, xzr
+
+        // Store (AH+AL) x (BH+BL) - ALxBL - AHxBH, low
+	stp	x8,  x9, [x2,#32]
+	stp	x19, x20, [x2,#48]
+
+	adds	x1,  x1, #1
+	adcs	x14, x14, x21
+	adcs	x15, x15, x22
+	adcs	x16, x16, x23
+	adcs	x17, x17, x24
+	adcs	x25,  x7, x25
+	adc	x26, x26, xzr
+
+	stp	x14, x15, [x2,#64]
+	stp	x16, x17, [x2,#80]
+	stp	x25, x26, [x2,#96]
+
+	ldp	x19, x20, [x29,#16]
+	ldp	x21, x22, [x29,#32]
+	ldp	x23, x24, [x29,#48]
+	ldp	x25, x26, [x29,#64]
+	ldp	x27, x28, [x29,#80]
+	ldp	x29, x30, [sp],#96
+	ret
+.globl	sike_fprdc
+.hidden	sike_fprdc
+.align	4
+sike_fprdc:
+	stp	x29, x30, [sp, #-96]!
+	add	x29, sp, xzr
+	stp	x19, x20, [sp,#16]
+	stp	x21, x22, [sp,#32]
+	stp	x23, x24, [sp,#48]
+	stp	x25, x26, [sp,#64]
+	stp	x27, x28, [sp,#80]
+
+	ldp	x2, x3, [x0,#0]       // a[0-1]
+
+        // Load the prime constant
+	adrp	x26, .Lp434p1
+	add	x26, x26, :lo12:.Lp434p1
+	ldp	x23, x24, [x26, #0x0]
+	ldp	x25, x26, [x26,#0x10]
+
+        // a[0-1] * p434+1
+	mul	x4, x2, x23  // C0
+	umulh	x7, x2, x23
+
+	mul	x5, x2, x24
+	umulh	x6, x2, x24
+
+	mul	x10, x3, x23
+	umulh	x11, x3, x23
+	adds	x5, x5, x7
+	adc	x6, x6, xzr
+
+	mul	x27, x2, x25
+	umulh	x28, x2, x25
+	adds	x5, x5, x10  // C1
+	adcs	x6, x6, x11
+	adc	x7, xzr, xzr
+
+	mul	x10, x3, x24
+	umulh	x11, x3, x24
+	adds	x6, x6, x27
+	adcs	x7, x7, x28
+	adc	x8, xzr, xzr
+
+	mul	x27, x2, x26
+	umulh	x28, x2, x26
+	adds	x6, x6, x10  // C2
+	adcs	x7, x7, x11
+	adc	x8, x8, xzr
+
+	mul	x10, x3, x25
+	umulh	x11, x3, x25
+	adds	x7, x7, x27
+	adcs	x8, x8, x28
+	adc	x9, xzr, xzr
+
+	mul	x27, x3, x26
+	umulh	x28, x3, x26
+	adds	x7, x7, x10  // C3
+	adcs	x8, x8, x11
+	adc	x9, x9, xzr
+	adds	x8, x8, x27  // C4
+	adc	x9, x9, x28  // C5
+
+
+
+	ldp	x10, x11, [x0, #0x18]
+	ldp	x12, x13, [x0, #0x28]
+	ldp	x14, x15, [x0, #0x38]
+	ldp	x16, x17, [x0, #0x48]
+	ldp	x19, x20, [x0, #0x58]
+	ldr	x21,      [x0, #0x68]
+
+	adds	x10, x10, x4
+	adcs	x11, x11, x5
+	adcs	x12, x12, x6
+	adcs	x13, x13, x7
+	adcs	x14, x14, x8
+	adcs	x15, x15, x9
+	adcs	x22, x16, xzr
+	adcs	x17, x17, xzr
+	adcs	x19, x19, xzr
+	adcs	x20, x20, xzr
+	adc	x21, x21, xzr
+
+	ldr	x2,  [x0,#0x10]       // a[2]
+        // a[2-3] * p434+1
+	mul	x4, x2, x23  // C0
+	umulh	x7, x2, x23
+
+	mul	x5, x2, x24
+	umulh	x6, x2, x24
+
+	mul	x0, x10, x23
+	umulh	x3, x10, x23
+	adds	x5, x5, x7
+	adc	x6, x6, xzr
+
+	mul	x27, x2, x25
+	umulh	x28, x2, x25
+	adds	x5, x5, x0  // C1
+	adcs	x6, x6, x3
+	adc	x7, xzr, xzr
+
+	mul	x0, x10, x24
+	umulh	x3, x10, x24
+	adds	x6, x6, x27
+	adcs	x7, x7, x28
+	adc	x8, xzr, xzr
+
+	mul	x27, x2, x26
+	umulh	x28, x2, x26
+	adds	x6, x6, x0  // C2
+	adcs	x7, x7, x3
+	adc	x8, x8, xzr
+
+	mul	x0, x10, x25
+	umulh	x3, x10, x25
+	adds	x7, x7, x27
+	adcs	x8, x8, x28
+	adc	x9, xzr, xzr
+
+	mul	x27, x10, x26
+	umulh	x28, x10, x26
+	adds	x7, x7, x0  // C3
+	adcs	x8, x8, x3
+	adc	x9, x9, xzr
+	adds	x8, x8, x27  // C4
+	adc	x9, x9, x28  // C5
+
+
+
+	adds	x12, x12, x4
+	adcs	x13, x13, x5
+	adcs	x14, x14, x6
+	adcs	x15, x15, x7
+	adcs	x16, x22, x8
+	adcs	x17, x17, x9
+	adcs	x22, x19, xzr
+	adcs	x20, x20, xzr
+	adc	x21, x21, xzr
+
+	mul	x4, x11, x23  // C0
+	umulh	x7, x11, x23
+
+	mul	x5, x11, x24
+	umulh	x6, x11, x24
+
+	mul	x10, x12, x23
+	umulh	x3, x12, x23
+	adds	x5, x5, x7
+	adc	x6, x6, xzr
+
+	mul	x27, x11, x25
+	umulh	x28, x11, x25
+	adds	x5, x5, x10  // C1
+	adcs	x6, x6, x3
+	adc	x7, xzr, xzr
+
+	mul	x10, x12, x24
+	umulh	x3, x12, x24
+	adds	x6, x6, x27
+	adcs	x7, x7, x28
+	adc	x8, xzr, xzr
+
+	mul	x27, x11, x26
+	umulh	x28, x11, x26
+	adds	x6, x6, x10  // C2
+	adcs	x7, x7, x3
+	adc	x8, x8, xzr
+
+	mul	x10, x12, x25
+	umulh	x3, x12, x25
+	adds	x7, x7, x27
+	adcs	x8, x8, x28
+	adc	x9, xzr, xzr
+
+	mul	x27, x12, x26
+	umulh	x28, x12, x26
+	adds	x7, x7, x10  // C3
+	adcs	x8, x8, x3
+	adc	x9, x9, xzr
+	adds	x8, x8, x27  // C4
+	adc	x9, x9, x28  // C5
+
+
+	adds	x14, x14, x4
+	adcs	x15, x15, x5
+	adcs	x16, x16, x6
+	adcs	x17, x17, x7
+	adcs	x19, x22, x8
+	adcs	x20, x20, x9
+	adc	x22, x21, xzr
+
+	stp	x14, x15, [x1, #0x0]     // C0, C1
+
+	mul	x4, x13, x23    // C0
+	umulh	x10, x13, x23
+
+	mul	x5, x13, x24
+	umulh	x27, x13, x24
+	adds	x5, x5, x10    // C1
+	adc	x10, xzr, xzr
+
+	mul	x6, x13, x25
+	umulh	x28, x13, x25
+	adds	x27, x10, x27
+	adcs	x6, x6, x27    // C2
+	adc	x10, xzr, xzr
+
+	mul	x7, x13, x26
+	umulh	x8, x13, x26
+	adds	x28, x10, x28
+	adcs	x7, x7, x28    // C3
+	adc	x8, x8, xzr    // C4
+
+	adds	x16, x16, x4
+	adcs	x17, x17, x5
+	adcs	x19, x19, x6
+	adcs	x20, x20, x7
+	adc	x21, x22, x8
+
+	str	x16,       [x1, #0x10]
+	stp	x17, x19,  [x1, #0x18]
+	stp	x20, x21,  [x1, #0x28]
+
+	ldp	x19, x20, [x29,#16]
+	ldp	x21, x22, [x29,#32]
+	ldp	x23, x24, [x29,#48]
+	ldp	x25, x26, [x29,#64]
+	ldp	x27, x28, [x29,#80]
+	ldp	x29, x30, [sp],#96
+	ret
+.globl	sike_fpadd
+.hidden	sike_fpadd
+.align	4
+sike_fpadd:
+	stp	x29,x30, [sp,#-16]!
+	add	x29, sp, #0
+
+	ldp	x3, x4,   [x0,#0]
+	ldp	x5, x6,   [x0,#16]
+	ldp	x7, x8,   [x0,#32]
+	ldr	x9,       [x0,#48]
+	ldp	x11, x12, [x1,#0]
+	ldp	x13, x14, [x1,#16]
+	ldp	x15, x16, [x1,#32]
+	ldr	x17,      [x1,#48]
+
+        // Add a + b
+	adds	x3, x3, x11
+	adcs	x4, x4, x12
+	adcs	x5, x5, x13
+	adcs	x6, x6, x14
+	adcs	x7, x7, x15
+	adcs	x8, x8, x16
+	adc	x9, x9, x17
+
+        //  Subtract 2xp434
+	adrp	x17, .Lp434x2
+	add	x17, x17, :lo12:.Lp434x2
+	ldp	x11, x12, [x17, #0]
+	ldp	x13, x14, [x17, #16]
+	ldp	x15, x16, [x17, #32]
+	subs	x3, x3, x11
+	sbcs	x4, x4, x12
+	sbcs	x5, x5, x12
+	sbcs	x6, x6, x13
+	sbcs	x7, x7, x14
+	sbcs	x8, x8, x15
+	sbcs	x9, x9, x16
+	sbc	x0, xzr, xzr    // x0 can be reused now
+
+        // Add 2xp434 anded with the mask in x0
+	and	x11, x11, x0
+	and	x12, x12, x0
+	and	x13, x13, x0
+	and	x14, x14, x0
+	and	x15, x15, x0
+	and	x16, x16, x0
+
+	adds	x3, x3, x11
+	adcs	x4, x4, x12
+	adcs	x5, x5, x12
+	adcs	x6, x6, x13
+	adcs	x7, x7, x14
+	adcs	x8, x8, x15
+	adc	x9, x9, x16
+
+	stp	x3, x4,  [x2,#0]
+	stp	x5, x6,  [x2,#16]
+	stp	x7, x8,  [x2,#32]
+	str	x9,      [x2,#48]
+
+	ldp	x29, x30, [sp],#16
+	ret
+.globl	sike_fpsub
+.hidden	sike_fpsub
+.align	4
+sike_fpsub:
+	stp	x29, x30, [sp,#-16]!
+	add	x29, sp, #0
+
+	ldp	x3, x4,   [x0,#0]
+	ldp	x5, x6,   [x0,#16]
+	ldp	x7, x8,   [x0,#32]
+	ldr	x9,       [x0,#48]
+	ldp	x11, x12, [x1,#0]
+	ldp	x13, x14, [x1,#16]
+	ldp	x15, x16, [x1,#32]
+	ldr	x17,      [x1,#48]
+
+        // Subtract a - b
+	subs	x3, x3, x11
+	sbcs	x4, x4, x12
+	sbcs	x5, x5, x13
+	sbcs	x6, x6, x14
+	sbcs	x7, x7, x15
+	sbcs	x8, x8, x16
+	sbcs	x9, x9, x17
+	sbc	x0, xzr, xzr
+
+        // Add 2xp434 anded with the mask in x0
+	adrp	x17, .Lp434x2
+	add	x17, x17, :lo12:.Lp434x2
+
+        // First half
+	ldp	x11, x12, [x17, #0]
+	ldp	x13, x14, [x17, #16]
+	ldp	x15, x16, [x17, #32]
+
+        // Add 2xp434 anded with the mask in x0
+	and	x11, x11, x0
+	and	x12, x12, x0
+	and	x13, x13, x0
+	and	x14, x14, x0
+	and	x15, x15, x0
+	and	x16, x16, x0
+
+	adds	x3, x3, x11
+	adcs	x4, x4, x12
+	adcs	x5, x5, x12
+	adcs	x6, x6, x13
+	adcs	x7, x7, x14
+	adcs	x8, x8, x15
+	adc	x9, x9, x16
+
+	stp	x3, x4,  [x2,#0]
+	stp	x5, x6,  [x2,#16]
+	stp	x7, x8,  [x2,#32]
+	str	x9,      [x2,#48]
+
+	ldp	x29, x30, [sp],#16
+	ret
+.globl	sike_mpadd_asm
+.hidden	sike_mpadd_asm
+.align	4
+sike_mpadd_asm:
+	stp	x29, x30, [sp,#-16]!
+	add	x29, sp, #0
+
+	ldp	x3, x4,   [x0,#0]
+	ldp	x5, x6,   [x0,#16]
+	ldp	x7, x8,   [x0,#32]
+	ldr	x9,       [x0,#48]
+	ldp	x11, x12, [x1,#0]
+	ldp	x13, x14, [x1,#16]
+	ldp	x15, x16, [x1,#32]
+	ldr	x17,      [x1,#48]
+
+	adds	x3, x3, x11
+	adcs	x4, x4, x12
+	adcs	x5, x5, x13
+	adcs	x6, x6, x14
+	adcs	x7, x7, x15
+	adcs	x8, x8, x16
+	adc	x9, x9, x17
+
+	stp	x3, x4,   [x2,#0]
+	stp	x5, x6,   [x2,#16]
+	stp	x7, x8,   [x2,#32]
+	str	x9,       [x2,#48]
+
+	ldp	x29, x30, [sp],#16
+	ret
+.globl	sike_mpsubx2_asm
+.hidden	sike_mpsubx2_asm
+.align	4
+sike_mpsubx2_asm:
+	stp	x29, x30, [sp,#-16]!
+	add	x29, sp, #0
+
+	ldp	x3, x4,   [x0,#0]
+	ldp	x5, x6,   [x0,#16]
+	ldp	x11, x12, [x1,#0]
+	ldp	x13, x14, [x1,#16]
+	subs	x3, x3, x11
+	sbcs	x4, x4, x12
+	sbcs	x5, x5, x13
+	sbcs	x6, x6, x14
+	ldp	x7, x8,   [x0,#32]
+	ldp	x9, x10,  [x0,#48]
+	ldp	x11, x12, [x1,#32]
+	ldp	x13, x14, [x1,#48]
+	sbcs	x7, x7, x11
+	sbcs	x8, x8, x12
+	sbcs	x9, x9, x13
+	sbcs	x10, x10, x14
+
+	stp	x3, x4,   [x2,#0]
+	stp	x5, x6,   [x2,#16]
+	stp	x7, x8,   [x2,#32]
+	stp	x9, x10,  [x2,#48]
+
+	ldp	x3, x4,   [x0,#64]
+	ldp	x5, x6,   [x0,#80]
+	ldp	x11, x12, [x1,#64]
+	ldp	x13, x14, [x1,#80]
+	sbcs	x3, x3, x11
+	sbcs	x4, x4, x12
+	sbcs	x5, x5, x13
+	sbcs	x6, x6, x14
+	ldp	x7, x8,   [x0,#96]
+	ldp	x11, x12, [x1,#96]
+	sbcs	x7, x7, x11
+	sbcs	x8, x8, x12
+	sbc	x0, xzr, xzr
+
+	stp	x3, x4,   [x2,#64]
+	stp	x5, x6,   [x2,#80]
+	stp	x7, x8,   [x2,#96]
+
+	ldp	x29, x30, [sp],#16
+	ret
+.globl	sike_mpdblsubx2_asm
+.hidden	sike_mpdblsubx2_asm
+.align	4
+sike_mpdblsubx2_asm:
+	stp	x29, x30, [sp, #-16]!
+	add	x29, sp, #0
+
+	ldp	x3, x4,   [x2, #0]
+	ldp	x5, x6,   [x2,#16]
+	ldp	x7, x8,   [x2,#32]
+
+	ldp	x11, x12, [x0, #0]
+	ldp	x13, x14, [x0,#16]
+	ldp	x15, x16, [x0,#32]
+
+	subs	x3, x3, x11
+	sbcs	x4, x4, x12
+	sbcs	x5, x5, x13
+	sbcs	x6, x6, x14
+	sbcs	x7, x7, x15
+	sbcs	x8, x8, x16
+
+        // x9 stores carry
+	adc	x9, xzr, xzr
+
+	ldp	x11, x12, [x1, #0]
+	ldp	x13, x14, [x1,#16]
+	ldp	x15, x16, [x1,#32]
+	subs	x3, x3, x11
+	sbcs	x4, x4, x12
+	sbcs	x5, x5, x13
+	sbcs	x6, x6, x14
+	sbcs	x7, x7, x15
+	sbcs	x8, x8, x16
+	adc	x9, x9, xzr
+
+	stp	x3, x4,   [x2, #0]
+	stp	x5, x6,   [x2,#16]
+	stp	x7, x8,   [x2,#32]
+
+	ldp	x3, x4,   [x2,#48]
+	ldp	x5, x6,   [x2,#64]
+	ldp	x7, x8,   [x2,#80]
+
+	ldp	x11, x12, [x0,#48]
+	ldp	x13, x14, [x0,#64]
+	ldp	x15, x16, [x0,#80]
+
+        // x9 = 2 - x9
+	neg	x9, x9
+	add	x9, x9, #2
+
+	subs	x3, x3, x9
+	sbcs	x3, x3, x11
+	sbcs	x4, x4, x12
+	sbcs	x5, x5, x13
+	sbcs	x6, x6, x14
+	sbcs	x7, x7, x15
+	sbcs	x8, x8, x16
+	adc	x9, xzr, xzr
+
+	ldp	x11, x12, [x1,#48]
+	ldp	x13, x14, [x1,#64]
+	ldp	x15, x16, [x1,#80]
+	subs	x3, x3, x11
+	sbcs	x4, x4, x12
+	sbcs	x5, x5, x13
+	sbcs	x6, x6, x14
+	sbcs	x7, x7, x15
+	sbcs	x8, x8, x16
+	adc	x9, x9, xzr
+
+	stp	x3, x4,   [x2,#48]
+	stp	x5, x6,   [x2,#64]
+	stp	x7, x8,   [x2,#80]
+
+	ldp	x3,  x4, [x2,#96]
+	ldp	x11, x12, [x0,#96]
+	ldp	x13, x14, [x1,#96]
+
+        // x9 = 2 - x9
+	neg	x9, x9
+	add	x9, x9, #2
+
+	subs	x3, x3, x9
+	sbcs	x3, x3, x11
+	sbcs	x4, x4, x12
+	subs	x3, x3, x13
+	sbc	x4, x4, x14
+	stp	x3, x4,   [x2,#96]
+
+	ldp	x29, x30, [sp],#16
+	ret
+#endif
+#endif  // !OPENSSL_NO_ASM

contrib/boringssl-cmake/linux-arm/crypto/chacha/chacha-armv4.S

@@ -1490,4 +1490,3 @@ ChaCha20_neon:
 #endif
 #endif
 #endif  // !OPENSSL_NO_ASM
-.section	.note.GNU-stack,"",%progbits