mirror of
https://github.com/apache/doris.git
synced 2026-11-04 07:31:17 +00:00
AArch64 currently uses portable scalar phmap control-byte scans. The subtraction-based H2 mask can include adjacent false-positive candidates: control bytes `0x12, 0x13` can both be returned when looking for `0x12`. Key comparison preserves correctness, but the extra candidates cost work. Add exact NEON control comparisons on little-endian AArch64 while keeping eight-byte groups, the portable fallback and the existing ARM dump/load layout. x86 keeps its existing SSE implementation. `PHMAP_HAVE_ARM_NEON=0` disables the new implementation at compile time. The normal third-party downloader applies this patch alongside the existing AArch64 int128 hash-mixer patch, with separate markers and a subshell that restores the caller's working directory. The NEON patch now includes context so a replay cannot silently insert the same code again. The downloader checks the actual source with a direction-locked reverse dry-run, recovers a missing marker when all hunks are already applied, and preflights every hunk before a fresh application. Partial or duplicated sources fail without further edits and do not retain a success marker. The standalone tests cover control masks, unaligned reads, special slots, conversion bounds, map operations, rehash and dump/load. The standalone C++ benchmark can be compiled directly. For an incremental comparison, retain the existing int128 patch in both the baseline and optimized dependency sources, adding NEON only to the optimized copy. ### Supplied ARM measurements The following measurements come from the supplied report on original Doris baseline `70f7dcbe11c8e142b81536c1dfaaf505ec05437b`, not a new ARM run of this rebased PR. That baseline predates master's AArch64 int128 patch. These numbers therefore do **not** establish the incremental gains of the final combined patch stack; a new ARM run with the combined patch stack is still needed. Environment: Neoverse-N2, 16 cores, nominal 3 GHz; Clang 20.1.8; C++17, `-O3 -DNDEBUG -march=armv8-a+crc -pthread`; one process pinned to CPU 15. Nine alternating baseline/NEON rounds, each measurement at least 0.2 seconds of thread CPU time. Values are median thread CPU ns/op. Reported intervals use 10,000 paired bootstrap resamples. Positive time reduction means faster; negative means slower. | Scenario | Baseline ns/op | NEON ns/op | Time reduction | Reported 95% interval | |---|---:|---:|---:|---:| | Hit lookup, 4,096 keys | 4.0773 | 3.8350 | +5.94% | [+5.84%, +6.11%] | | Hit lookup, 100,000 keys | 10.6120 | 9.6412 | +9.15% | [+8.99%, +12.44%] | | Hit lookup, 114,000 keys | 11.4606 | 10.5508 | +7.94% | [+7.73%, +11.42%] | | Hit lookup, 1,000,000 keys | 16.3554 | 14.4228 | +11.82% | [+10.20%, +12.74%] | | Miss lookup, 4,096 keys | 3.4818 | 3.3069 | +5.02% | [+4.81%, +5.08%] | | Miss lookup, 100,000 keys | 9.7027 | 9.9144 | -2.18% | [-2.91%, -1.27%] | | Miss lookup, 114,000 keys | 16.8860 | 17.5147 | -3.72% | [-3.93%, -2.89%] | | Miss lookup, 1,000,000 keys | 8.6927 | 8.1035 | +6.78% | [+4.93%, +9.01%] | | Insert, 100,000 keys, including allocation/destruction | 9.8116 | 9.2758 | +5.46% | [+3.94%, +6.25%] | | Erase/reinsert, 20,000 operations per iteration | 16.3032 | 16.3810 | -0.48% | [-1.19%, +0.97%] | | Synthetic adjacent-H2 scan, 32,768 groups | 2.7578 | 1.7641 | +36.03% | [+35.75%, +36.09%] | Load factors differ: approximately 50.0%, 76.3%, 87.0% and 47.7% at the four lookup sizes. Two miss-lookup workloads regress reproducibly. The erase/reinsert interval crosses zero. The adjacent-H2 case measures group scans and candidate-key comparisons, not complete table lookups. These are library microbenchmarks, not end-to-end SQL gains. ### Validation **Reported in the supplied ARM bundle:** randomized scalar-oracle checks, baseline/NEON/forced-portable paths, bidirectional dump/load and ASAN/UBSAN passed. The archive contains the patch and report; these ARM executions were not repeated during this submission. **Executed locally after rebasing onto master `3d2d9aac54148056529c13ef4b9fbdbcb65fab77` (x86_64, Clang 16.0.6):** - Standalone correctness tests passed for baseline, patched and explicitly NEON-disabled builds; x86 selected the existing 16-byte SSE groups in all three. Tests also exercise the portable group implementation directly. - Baseline-to-patched and patched-to-baseline dump/load passed; patched ASAN/UBSAN passed. - Benchmark source compiled with `-Wall -Wextra -Werror`; all 11 scenarios passed a short checksum smoke run. No x86 performance conclusion is drawn from it. - Standard third-party download/patch script passed twice with `OLDPWD` unset. The standard downloader produces byte-identical headers to those used by the standalone tests. - clang-format 16, repository clang-tidy entry point for both standalone C++ files, shell syntax and `git diff --check` passed. **Downloader recovery follow-up:** `bash thirdparty/test/parallel-hashmap-patch-test.sh` passed using the pinned cached archive and the real downloader; no dependency downloads were needed. It covers fresh extraction, normal reruns, an applied patch with a missing marker, a stale marker over pristine sources, partially applied sources with/without a marker, and duplicate NEON definitions. Successful reruns compare both complete headers; failing cases verify unchanged source and absence of the success marker. The same test detects the original replay bug. The regenerated patch inserts exactly the same 67 C++ lines, and its applied header bytes match the original optimized source. Bash syntax and shell whitespace checks passed; generated patch context preserves the pinned dependency's existing whitespace. Full Doris BE compilation, SQL regression/performance tests and new ARM measurements against the combined int128+NEON patch stack have not been run. The C++ test and benchmark have no Python dependency and can be compiled directly: ```bash bash thirdparty/download-thirdparty.sh parallel_hashmap clang++ -std=c++17 -O2 -pthread -Wall -Wextra -Werror \ -isystem thirdparty/src/parallel-hashmap-1.3.8 \ thirdparty/tests/parallel_hashmap_neon_test.cpp -o /tmp/phmap-neon-test /tmp/phmap-neon-test clang++ -std=c++17 -O3 -DNDEBUG -pthread -Wall -Wextra -Werror \ -isystem thirdparty/src/parallel-hashmap-1.3.8 \ thirdparty/benchmarks/parallel_hashmap_bench.cpp -o /tmp/phmap-neon-bench taskset -c 15 /tmp/phmap-neon-bench 0.2 ``` Select an available isolated CPU instead of CPU 15 when necessary. For the reported ARM compiler settings, add `-march=armv8-a+crc`. The benchmark emits one JSON line per scenario with CPU/wall timings and checksums. To compare against baseline on current master, extract the verified source archive into another directory, apply only `parallel-hashmap-1.3.8-aarch64-int128.patch`, compile the same C++ benchmark against that directory with identical flags, and alternate baseline/optimized execution order. ### Release note Accelerate phmap control-byte scanning on little-endian AArch64 while preserving eight-byte ARM groups and the portable fallback.
201 lines
6.7 KiB
C++
201 lines
6.7 KiB
C++
// Licensed to the Apache Software Foundation (ASF) under one
|
|
// or more contributor license agreements. See the NOTICE file
|
|
// distributed with this work for additional information
|
|
// regarding copyright ownership. The ASF licenses this file
|
|
// to you under the Apache License, Version 2.0 (the
|
|
// "License"); you may not use this file except in compliance
|
|
// with the License. You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing,
|
|
// software distributed under the License is distributed on an
|
|
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
// KIND, either express or implied. See the License for the
|
|
// specific language governing permissions and limitations
|
|
// under the License.
|
|
|
|
#include <parallel_hashmap/phmap.h>
|
|
|
|
#include <algorithm>
|
|
#include <array>
|
|
#include <chrono>
|
|
#include <cstdint>
|
|
#include <ctime>
|
|
#include <iomanip>
|
|
#include <iostream>
|
|
#include <random>
|
|
#include <stdexcept>
|
|
#include <string>
|
|
#include <type_traits>
|
|
#include <vector>
|
|
|
|
namespace {
|
|
|
|
using Map = phmap::flat_hash_map<uint64_t, uint64_t>;
|
|
using Group = phmap::priv::Group;
|
|
|
|
uint64_t mix(uint64_t value) {
|
|
value += 0x9e3779b97f4a7c15ULL;
|
|
value = (value ^ (value >> 30)) * 0xbf58476d1ce4e5b9ULL;
|
|
value = (value ^ (value >> 27)) * 0x94d049bb133111ebULL;
|
|
return value ^ (value >> 31);
|
|
}
|
|
|
|
double cpu_seconds() {
|
|
timespec value {};
|
|
if (::clock_gettime(CLOCK_THREAD_CPUTIME_ID, &value) != 0) {
|
|
throw std::runtime_error("clock_gettime failed");
|
|
}
|
|
return value.tv_sec + value.tv_nsec * 1e-9;
|
|
}
|
|
|
|
template <typename Work>
|
|
void measure(const std::string& name, uint64_t operations, size_t size, size_t capacity,
|
|
double seconds, Work work) {
|
|
uint64_t expected = work();
|
|
uint64_t checksum = 0;
|
|
uint64_t iterations = 1;
|
|
double cpu_elapsed = 0;
|
|
double wall_elapsed = 0;
|
|
for (;;) {
|
|
checksum = 0;
|
|
auto wall_start = std::chrono::steady_clock::now();
|
|
double cpu_start = cpu_seconds();
|
|
for (uint64_t iteration = 0; iteration < iterations; ++iteration) {
|
|
// Force each iteration to read the table again, including under LTO.
|
|
asm volatile("" ::: "memory");
|
|
checksum += work();
|
|
asm volatile("" : "+r"(checksum) : : "memory");
|
|
}
|
|
cpu_elapsed = cpu_seconds() - cpu_start;
|
|
wall_elapsed = std::chrono::duration<double>(std::chrono::steady_clock::now() - wall_start)
|
|
.count();
|
|
if (cpu_elapsed >= seconds) {
|
|
break;
|
|
}
|
|
iterations *= 2;
|
|
}
|
|
if (checksum != expected * iterations) {
|
|
throw std::runtime_error("benchmark result changed between iterations");
|
|
}
|
|
auto count = static_cast<double>(operations) * iterations;
|
|
std::cout << std::setprecision(12) << R"({"name":")" << name << R"(","size":)" << size
|
|
<< R"(,"capacity":)" << capacity << R"(,"group_width":)" << Group::kWidth
|
|
<< R"(,"portable":)"
|
|
<< std::is_same_v<Group, phmap::priv::GroupPortableImpl> << R"(,"iterations":)"
|
|
<< iterations << R"(,"operations":)" << operations << R"(,"cpu_ns_per_op":)"
|
|
<< cpu_elapsed * 1e9 / count << R"(,"wall_ns_per_op":)" << wall_elapsed * 1e9 / count
|
|
<< R"(,"checksum_per_iteration":)" << expected << R"(,"checksum":)" << checksum << "}"
|
|
<< std::endl;
|
|
}
|
|
|
|
std::vector<uint64_t> make_keys(size_t size, size_t start = 0) {
|
|
std::vector<uint64_t> keys;
|
|
keys.reserve(size);
|
|
for (size_t i = 0; i < size; ++i) {
|
|
keys.push_back(mix(i + start));
|
|
}
|
|
std::mt19937_64 random(81384);
|
|
std::shuffle(keys.begin(), keys.end(), random);
|
|
return keys;
|
|
}
|
|
|
|
void lookup_benchmarks(size_t size, double seconds) {
|
|
auto keys = make_keys(size);
|
|
auto misses = make_keys(size, size);
|
|
Map map;
|
|
map.reserve(size);
|
|
for (auto key : keys) {
|
|
map.emplace(key, key + 1);
|
|
}
|
|
measure("find_hit/" + std::to_string(size), size, size, map.capacity(), seconds, [&] {
|
|
uint64_t checksum = 0;
|
|
for (auto key : keys) {
|
|
auto found = map.find(key);
|
|
checksum += found->second;
|
|
}
|
|
return checksum;
|
|
});
|
|
measure("find_miss/" + std::to_string(size), size, size, map.capacity(), seconds, [&] {
|
|
uint64_t checksum = 0;
|
|
for (auto key : misses) {
|
|
checksum += map.find(key) != map.end();
|
|
}
|
|
return checksum;
|
|
});
|
|
}
|
|
|
|
void mutation_benchmarks(double seconds) {
|
|
constexpr size_t size = 100000;
|
|
auto keys = make_keys(size);
|
|
measure("insert_reserved/100000", size, size, 0, seconds, [&] {
|
|
Map map;
|
|
map.reserve(size);
|
|
for (auto key : keys) {
|
|
map.emplace(key, key + 1);
|
|
}
|
|
asm volatile("" : : "g"(&map) : "memory");
|
|
return map.size();
|
|
});
|
|
Map map;
|
|
map.reserve(size);
|
|
for (auto key : keys) {
|
|
map.emplace(key, key + 1);
|
|
}
|
|
constexpr size_t changes = 10000;
|
|
measure("erase_insert/10000", changes * 2, size, map.capacity(), seconds, [&] {
|
|
for (size_t i = 0; i < changes; ++i) {
|
|
map.erase(keys[i]);
|
|
}
|
|
for (size_t i = 0; i < changes; ++i) {
|
|
map.emplace(keys[i], keys[i] + 1);
|
|
}
|
|
return map.size();
|
|
});
|
|
}
|
|
|
|
void adjacent_h2_benchmark(double seconds) {
|
|
struct Probe {
|
|
std::array<phmap::priv::ctrl_t, Group::kWidth> ctrl;
|
|
std::array<uint64_t, Group::kWidth> keys;
|
|
uint64_t needle;
|
|
};
|
|
std::vector<Probe> probes(32768);
|
|
for (size_t i = 0; i < probes.size(); ++i) {
|
|
auto& probe = probes[i];
|
|
probe.ctrl.fill(phmap::priv::kEmpty);
|
|
probe.ctrl[2] = 0x12;
|
|
probe.ctrl[3] = 0x13;
|
|
for (size_t j = 0; j < probe.keys.size(); ++j) {
|
|
probe.keys[j] = mix(i * Group::kWidth + j);
|
|
}
|
|
probe.needle = probe.keys[2];
|
|
}
|
|
measure("group_adjacent_h2/32768", probes.size(), probes.size(), 0, seconds, [&] {
|
|
uint64_t checksum = 0;
|
|
for (const auto& probe : probes) {
|
|
for (auto position : Group(probe.ctrl.data()).Match(0x12)) {
|
|
checksum += probe.keys[position] == probe.needle;
|
|
}
|
|
}
|
|
return checksum;
|
|
});
|
|
}
|
|
|
|
} // namespace
|
|
|
|
int main(int argc, char** argv) {
|
|
double seconds = argc == 2 ? std::stod(argv[1]) : 0.2;
|
|
if (seconds <= 0 || seconds > 10) {
|
|
std::cerr << "minimum CPU seconds must be in (0, 10]\n";
|
|
return 1;
|
|
}
|
|
for (size_t size : {size_t {4096}, size_t {100000}, size_t {114000}, size_t {1000000}}) {
|
|
lookup_benchmarks(size, seconds);
|
|
}
|
|
mutation_benchmarks(seconds);
|
|
adjacent_h2_benchmark(seconds);
|
|
return 0;
|
|
}
|