Commit e3fa058

Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update histogram to 0.11.10
PR-URL: #64296 Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent e75bdb9 commit e3fa058

2 files changed

Lines changed: 103 additions & 17 deletions

File tree

‎deps/histogram/include/hdr/hdr_histogram_version.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
#ifndefHDR_HISTOGRAM_VERSION_H
88
#defineHDR_HISTOGRAM_VERSION_H
99

10-
#defineHDR_HISTOGRAM_VERSION "0.11.9"
10+
#defineHDR_HISTOGRAM_VERSION "0.11.10"
1111

1212
#endif// HDR_HISTOGRAM_VERSION_H

‎deps/histogram/src/hdr_histogram.c‎

Lines changed: 102 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,25 @@
2323

2424
#includeHDR_MALLOC_INCLUDE
2525

26+
/* Prefetch hint for upcoming write access */
27+
#if defined(__GNUC__) || defined(__clang__)
28+
# defineHDR_PREFETCH_WRITE(addr) __builtin_prefetch((addr), 1, 3)
29+
# defineHDR_LIKELY(x) __builtin_expect(!!(x), 1)
30+
# defineHDR_UNLIKELY(x) __builtin_expect(!!(x), 0)
31+
#else
32+
# defineHDR_PREFETCH_WRITE(addr) ((void)(addr))
33+
# defineHDR_LIKELY(x) (x)
34+
# defineHDR_UNLIKELY(x) (x)
35+
#endif
36+
37+
/* Runtime-dispatched AVX2 path: keep the rest of this TU at the project's
38+
baseline ISA so the shipped binary does not silently require AVX2. */
39+
#if (defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86)) \
40+
&& (defined(__GNUC__) || defined(__clang__)) && !defined(__INTEL_COMPILER)
41+
# defineHDR_HAS_AVX2_DISPATCH 1
42+
# include<immintrin.h>
43+
#endif
44+
2645
/* ###### ####### ## ## ## ## ######## ###### */
2746
/* ## ## ## ## ## ## ### ## ## ## ## */
2847
/* ## ## ## ## ## #### ## ## ## */
@@ -67,24 +86,48 @@ static int64_t counts_get_normalised(const struct hdr_histogram* h, int32_t inde
6786
staticvoidcounts_inc_normalised(
6887
structhdr_histogram*h, int32_tindex, int64_tvalue)
6988
{
70-
int32_tnormalised_index=normalize_index(h, index);
71-
h->counts[normalised_index] +=value;
89+
if (HDR_LIKELY(h->normalizing_index_offset==0))
90+
{
91+
HDR_PREFETCH_WRITE(&h->counts[index]);
92+
h->counts[index] +=value;
93+
}
94+
else
95+
{
96+
int32_tnormalised_index=normalize_index(h, index);
97+
HDR_PREFETCH_WRITE(&h->counts[normalised_index]);
98+
h->counts[normalised_index] +=value;
99+
}
72100
h->total_count+=value;
73101
}
74102

75103
staticvoidcounts_inc_normalised_atomic(
76104
structhdr_histogram*h, int32_tindex, int64_tvalue)
77105
{
78-
int32_tnormalised_index=normalize_index(h, index);
79-
80-
hdr_atomic_add_fetch_64(&h->counts[normalised_index], value);
106+
if (HDR_LIKELY(h->normalizing_index_offset==0))
107+
{
108+
HDR_PREFETCH_WRITE(&h->counts[index]);
109+
hdr_atomic_add_fetch_64(&h->counts[index], value);
110+
}
111+
else
112+
{
113+
int32_tnormalised_index=normalize_index(h, index);
114+
HDR_PREFETCH_WRITE(&h->counts[normalised_index]);
115+
hdr_atomic_add_fetch_64(&h->counts[normalised_index], value);
116+
}
81117
hdr_atomic_add_fetch_64(&h->total_count, value);
82118
}
83119

84120
staticvoidupdate_min_max(structhdr_histogram*h, int64_tvalue)
85121
{
86-
h->min_value= (value<h->min_value&&value!=0) ? value : h->min_value;
87-
h->max_value= (value>h->max_value) ? value : h->max_value;
122+
if (HDR_UNLIKELY(value>h->max_value))
123+
{
124+
h->max_value=value;
125+
}
126+
127+
if (HDR_UNLIKELY(value!=0&&value<h->min_value))
128+
{
129+
h->min_value=value;
130+
}
88131
}
89132

90133
staticvoidupdate_min_max_atomic(structhdr_histogram*h, int64_tvalue)
@@ -498,7 +541,7 @@ bool hdr_record_values(struct hdr_histogram* h, int64_t value, int64_t count)
498541
}
499542

500543
counts_index=counts_index_for(h, value);
501-
if (counts_index<0||h->counts_len <= counts_index)
544+
if ((uint32_t)counts_index>= (uint32_t)h->counts_len)
502545
{
503546
return false;
504547
}
@@ -520,7 +563,7 @@ bool hdr_record_values_atomic(struct hdr_histogram* h, int64_t value, int64_t co
520563

521564
counts_index=counts_index_for(h, value);
522565

523-
if (counts_index<0||h->counts_len <= counts_index)
566+
if ((uint32_t)counts_index>= (uint32_t)h->counts_len)
524567
{
525568
return false;
526569
}
@@ -665,22 +708,65 @@ int64_t hdr_min(const struct hdr_histogram* h)
665708
returnnon_zero_min(h);
666709
}
667710

668-
staticint64_tget_value_from_idx_up_to_count(conststructhdr_histogram*h, int64_tcount_at_percentile)
711+
staticint64_tget_value_from_idx_up_to_count_scalar(
712+
conststructhdr_histogram*h, int64_tcount_at_percentile)
669713
{
670714
int64_tcount_to_idx=0;
671-
672-
count_at_percentile=0<count_at_percentile ? count_at_percentile : 1;
673-
for (int32_tidx=0; idx<h->counts_len; idx++)
674-
{
715+
for (int32_tidx=0; idx<h->counts_len; idx++) {
675716
count_to_idx+=h->counts[idx];
676717
if (count_to_idx >= count_at_percentile)
677-
{
678718
returnhdr_value_at_index(h, idx);
679-
}
680719
}
720+
return0;
721+
}
681722

723+
#ifdefHDR_HAS_AVX2_DISPATCH
724+
__attribute__((target("avx2")))
725+
staticint64_tget_value_from_idx_up_to_count_avx2(
726+
conststructhdr_histogram*h, int64_tcount_at_percentile)
727+
{
728+
int64_trunning=0;
729+
int32_tidx=0;
730+
constint32_tlimit=h->counts_len& ~3;
731+
732+
for (; idx<limit; idx+=4) {
733+
__m256iv=_mm256_loadu_si256((const__m256i*)&h->counts[idx]);
734+
__m128ilo=_mm256_castsi256_si128(v);
735+
__m128ihi=_mm256_extracti128_si256(v, 1);
736+
__m128is=_mm_add_epi64(lo, hi);
737+
/* Lanes are non-negative counts whose total fits in int64_t (total_count
738+
invariant), so the chunk sum cannot overflow under valid state. Use
739+
unsigned add to avoid signed-overflow UB if invariants are violated. */
740+
int64_tchunk= (int64_t)((uint64_t)_mm_extract_epi64(s, 0)
741+
+ (uint64_t)_mm_extract_epi64(s, 1));
742+
743+
if (__builtin_expect(running+chunk >= count_at_percentile, 0)) {
744+
for (int32_tj=idx; j<idx+4; j++) {
745+
running+=h->counts[j];
746+
if (running >= count_at_percentile)
747+
returnhdr_value_at_index(h, j);
748+
}
749+
}
750+
running+=chunk;
751+
}
752+
for (; idx<h->counts_len; idx++) {
753+
running+=h->counts[idx];
754+
if (running >= count_at_percentile)
755+
returnhdr_value_at_index(h, idx);
756+
}
682757
return0;
683758
}
759+
#endif
760+
761+
staticint64_tget_value_from_idx_up_to_count(conststructhdr_histogram*h, int64_tcount_at_percentile)
762+
{
763+
count_at_percentile=count_at_percentile>0 ? count_at_percentile : 1;
764+
#ifdefHDR_HAS_AVX2_DISPATCH
765+
if (__builtin_cpu_supports("avx2"))
766+
returnget_value_from_idx_up_to_count_avx2(h, count_at_percentile);
767+
#endif
768+
returnget_value_from_idx_up_to_count_scalar(h, count_at_percentile);
769+
}
684770

685771

686772
int64_thdr_value_at_percentile(conststructhdr_histogram*h, doublepercentile)

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit e3fa058
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update histogram to 0.11.10
PR-URL: #64296
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent e75bdb9 commit e3fa058
2 files changed
Lines changed: 103 additions & 17 deletions
File tree
‎deps/histogram/include/hdr/hdr_histogram_version.h‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
#ifndefHDR_HISTOGRAM_VERSION_H
88
#defineHDR_HISTOGRAM_VERSION_H
99

10-
#defineHDR_HISTOGRAM_VERSION "0.11.9"
10+
#defineHDR_HISTOGRAM_VERSION "0.11.10"
1111

1212
#endif// HDR_HISTOGRAM_VERSION_H
‎deps/histogram/src/hdr_histogram.c‎
Lines changed: 102 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,25 @@
2323

2424
#includeHDR_MALLOC_INCLUDE
2525

26+
/* Prefetch hint for upcoming write access */
27+
#if defined(__GNUC__) || defined(__clang__)
28+
# defineHDR_PREFETCH_WRITE(addr) __builtin_prefetch((addr), 1, 3)
29+
# defineHDR_LIKELY(x) __builtin_expect(!!(x), 1)
30+
# defineHDR_UNLIKELY(x) __builtin_expect(!!(x), 0)
31+
#else
32+
# defineHDR_PREFETCH_WRITE(addr) ((void)(addr))
33+
# defineHDR_LIKELY(x) (x)
34+
# defineHDR_UNLIKELY(x) (x)
35+
#endif
36+
37+
/* Runtime-dispatched AVX2 path: keep the rest of this TU at the project's
38+
 baseline ISA so the shipped binary does not silently require AVX2. */
39+
#if (defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86)) \
40+
&& (defined(__GNUC__) || defined(__clang__)) && !defined(__INTEL_COMPILER)
41+
# defineHDR_HAS_AVX2_DISPATCH 1
42+
# include<immintrin.h>
43+
#endif
44+
2645
/* ###### ####### ## ## ## ## ######## ###### */
2746
/* ## ## ## ## ## ## ### ## ## ## ## */
2847
/* ## ## ## ## ## #### ## ## ## */
@@ -67,24 +86,48 @@ static int64_t counts_get_normalised(const struct hdr_histogram* h, int32_t inde
6786
staticvoidcounts_inc_normalised(
6887
structhdr_histogram*h, int32_tindex, int64_tvalue)
6988
{
70-
int32_tnormalised_index=normalize_index(h, index);
71-
h->counts[normalised_index] +=value;
89+
if (HDR_LIKELY(h->normalizing_index_offset==0))
90+
 {
91+
HDR_PREFETCH_WRITE(&h->counts[index]);
92+
h->counts[index] +=value;
93+
 }
94+
else
95+
 {
96+
int32_tnormalised_index=normalize_index(h, index);
97+
HDR_PREFETCH_WRITE(&h->counts[normalised_index]);
98+
h->counts[normalised_index] +=value;
99+
 }
72100
h->total_count+=value;
73101
}
74102

75103
staticvoidcounts_inc_normalised_atomic(
76104
structhdr_histogram*h, int32_tindex, int64_tvalue)
77105
{
78-
int32_tnormalised_index=normalize_index(h, index);
79-
80-
hdr_atomic_add_fetch_64(&h->counts[normalised_index], value);
106+
if (HDR_LIKELY(h->normalizing_index_offset==0))
107+
 {
108+
HDR_PREFETCH_WRITE(&h->counts[index]);
109+
hdr_atomic_add_fetch_64(&h->counts[index], value);
110+
 }
111+
else
112+
 {
113+
int32_tnormalised_index=normalize_index(h, index);
114+
HDR_PREFETCH_WRITE(&h->counts[normalised_index]);
115+
hdr_atomic_add_fetch_64(&h->counts[normalised_index], value);
116+
 }
81117
hdr_atomic_add_fetch_64(&h->total_count, value);
82118
}
83119

84120
staticvoidupdate_min_max(structhdr_histogram*h, int64_tvalue)
85121
{
86-
h->min_value= (value<h->min_value&&value!=0) ? value : h->min_value;
87-
h->max_value= (value>h->max_value) ? value : h->max_value;
122+
if (HDR_UNLIKELY(value>h->max_value))
123+
 {
124+
h->max_value=value;
125+
 }
126+
127+
if (HDR_UNLIKELY(value!=0&&value<h->min_value))
128+
 {
129+
h->min_value=value;
130+
 }
88131
}
89132

90133
staticvoidupdate_min_max_atomic(structhdr_histogram*h, int64_tvalue)
@@ -498,7 +541,7 @@ bool hdr_record_values(struct hdr_histogram* h, int64_t value, int64_t count)
498541
 }
499542

500543
counts_index=counts_index_for(h, value);
501-
if (counts_index<0||h->counts_len <= counts_index)
544+
if ((uint32_t)counts_index>= (uint32_t)h->counts_len)
502545
 {
503546
return false;
504547
 }
@@ -520,7 +563,7 @@ bool hdr_record_values_atomic(struct hdr_histogram* h, int64_t value, int64_t co
520563

521564
counts_index=counts_index_for(h, value);
522565

523-
if (counts_index<0||h->counts_len <= counts_index)
566+
if ((uint32_t)counts_index>= (uint32_t)h->counts_len)
524567
 {
525568
return false;
526569
 }
@@ -665,22 +708,65 @@ int64_t hdr_min(const struct hdr_histogram* h)
665708
returnnon_zero_min(h);
666709
}
667710

668-
staticint64_tget_value_from_idx_up_to_count(conststructhdr_histogram*h, int64_tcount_at_percentile)
711+
staticint64_tget_value_from_idx_up_to_count_scalar(
712+
conststructhdr_histogram*h, int64_tcount_at_percentile)
669713
{
670714
int64_tcount_to_idx=0;
671-
672-
count_at_percentile=0<count_at_percentile ? count_at_percentile : 1;
673-
for (int32_tidx=0; idx<h->counts_len; idx++)
674-
 {
715+
for (int32_tidx=0; idx<h->counts_len; idx++) {
675716
count_to_idx+=h->counts[idx];
676717
if (count_to_idx >= count_at_percentile)
677-
 {
678718
returnhdr_value_at_index(h, idx);
679-
 }
680719
 }
720+
return0;
721+
}
681722

723+
#ifdefHDR_HAS_AVX2_DISPATCH
724+
__attribute__((target("avx2")))
725+
staticint64_tget_value_from_idx_up_to_count_avx2(
726+
conststructhdr_histogram*h, int64_tcount_at_percentile)
727+
{
728+
int64_trunning=0;
729+
int32_tidx=0;
730+
constint32_tlimit=h->counts_len& ~3;
731+
732+
for (; idx<limit; idx+=4) {
733+
__m256iv=_mm256_loadu_si256((const__m256i*)&h->counts[idx]);
734+
__m128ilo=_mm256_castsi256_si128(v);
735+
__m128ihi=_mm256_extracti128_si256(v, 1);
736+
__m128is=_mm_add_epi64(lo, hi);
737+
/* Lanes are non-negative counts whose total fits in int64_t (total_count
738+
 invariant), so the chunk sum cannot overflow under valid state. Use
739+
 unsigned add to avoid signed-overflow UB if invariants are violated. */
740+
int64_tchunk= (int64_t)((uint64_t)_mm_extract_epi64(s, 0)
741+
+ (uint64_t)_mm_extract_epi64(s, 1));
742+
743+
if (__builtin_expect(running+chunk >= count_at_percentile, 0)) {
744+
for (int32_tj=idx; j<idx+4; j++) {
745+
running+=h->counts[j];
746+
if (running >= count_at_percentile)
747+
returnhdr_value_at_index(h, j);
748+
 }
749+
 }
750+
running+=chunk;
751+
 }
752+
for (; idx<h->counts_len; idx++) {
753+
running+=h->counts[idx];
754+
if (running >= count_at_percentile)
755+
returnhdr_value_at_index(h, idx);
756+
 }
682757
return0;
683758
}
759+
#endif
760+
761+
staticint64_tget_value_from_idx_up_to_count(conststructhdr_histogram*h, int64_tcount_at_percentile)
762+
{
763+
count_at_percentile=count_at_percentile>0 ? count_at_percentile : 1;
764+
#ifdefHDR_HAS_AVX2_DISPATCH
765+
if (__builtin_cpu_supports("avx2"))
766+
returnget_value_from_idx_up_to_count_avx2(h, count_at_percentile);
767+
#endif
768+
returnget_value_from_idx_up_to_count_scalar(h, count_at_percentile);
769+
}
684770

685771

686772
int64_thdr_value_at_percentile(conststructhdr_histogram*h, doublepercentile)
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit e3fa058
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update histogram to 0.11.10
PR-URL: #64296
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent e75bdb9 commit e3fa058
2 files changed
Lines changed: 103 additions & 17 deletions
File tree
‎deps/histogram/include/hdr/hdr_histogram_version.h‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
#ifndefHDR_HISTOGRAM_VERSION_H
88
#defineHDR_HISTOGRAM_VERSION_H
99

10-
#defineHDR_HISTOGRAM_VERSION "0.11.9"
10+
#defineHDR_HISTOGRAM_VERSION "0.11.10"
1111

1212
#endif// HDR_HISTOGRAM_VERSION_H
‎deps/histogram/src/hdr_histogram.c‎
Lines changed: 102 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,25 @@
2323

2424
#includeHDR_MALLOC_INCLUDE
2525

26+
/* Prefetch hint for upcoming write access */
27+
#if defined(__GNUC__) || defined(__clang__)
28+
# defineHDR_PREFETCH_WRITE(addr) __builtin_prefetch((addr), 1, 3)
29+
# defineHDR_LIKELY(x) __builtin_expect(!!(x), 1)
30+
# defineHDR_UNLIKELY(x) __builtin_expect(!!(x), 0)
31+
#else
32+
# defineHDR_PREFETCH_WRITE(addr) ((void)(addr))
33+
# defineHDR_LIKELY(x) (x)
34+
# defineHDR_UNLIKELY(x) (x)
35+
#endif
36+
37+
/* Runtime-dispatched AVX2 path: keep the rest of this TU at the project's
38+
 baseline ISA so the shipped binary does not silently require AVX2. */
39+
#if (defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86)) \
40+
&& (defined(__GNUC__) || defined(__clang__)) && !defined(__INTEL_COMPILER)
41+
# defineHDR_HAS_AVX2_DISPATCH 1
42+
# include<immintrin.h>
43+
#endif
44+
2645
/* ###### ####### ## ## ## ## ######## ###### */
2746
/* ## ## ## ## ## ## ### ## ## ## ## */
2847
/* ## ## ## ## ## #### ## ## ## */
@@ -67,24 +86,48 @@ static int64_t counts_get_normalised(const struct hdr_histogram* h, int32_t inde
6786
staticvoidcounts_inc_normalised(
6887
structhdr_histogram*h, int32_tindex, int64_tvalue)
6988
{
70-
int32_tnormalised_index=normalize_index(h, index);
71-
h->counts[normalised_index] +=value;
89+
if (HDR_LIKELY(h->normalizing_index_offset==0))
90+
 {
91+
HDR_PREFETCH_WRITE(&h->counts[index]);
92+
h->counts[index] +=value;
93+
 }
94+
else
95+
 {
96+
int32_tnormalised_index=normalize_index(h, index);
97+
HDR_PREFETCH_WRITE(&h->counts[normalised_index]);
98+
h->counts[normalised_index] +=value;
99+
 }
72100
h->total_count+=value;
73101
}
74102

75103
staticvoidcounts_inc_normalised_atomic(
76104
structhdr_histogram*h, int32_tindex, int64_tvalue)
77105
{
78-
int32_tnormalised_index=normalize_index(h, index);
79-
80-
hdr_atomic_add_fetch_64(&h->counts[normalised_index], value);
106+
if (HDR_LIKELY(h->normalizing_index_offset==0))
107+
 {
108+
HDR_PREFETCH_WRITE(&h->counts[index]);
109+
hdr_atomic_add_fetch_64(&h->counts[index], value);
110+
 }
111+
else
112+
 {
113+
int32_tnormalised_index=normalize_index(h, index);
114+
HDR_PREFETCH_WRITE(&h->counts[normalised_index]);
115+
hdr_atomic_add_fetch_64(&h->counts[normalised_index], value);
116+
 }
81117
hdr_atomic_add_fetch_64(&h->total_count, value);
82118
}
83119

84120
staticvoidupdate_min_max(structhdr_histogram*h, int64_tvalue)
85121
{
86-
h->min_value= (value<h->min_value&&value!=0) ? value : h->min_value;
87-
h->max_value= (value>h->max_value) ? value : h->max_value;
122+
if (HDR_UNLIKELY(value>h->max_value))
123+
 {
124+
h->max_value=value;
125+
 }
126+
127+
if (HDR_UNLIKELY(value!=0&&value<h->min_value))
128+
 {
129+
h->min_value=value;
130+
 }
88131
}
89132

90133
staticvoidupdate_min_max_atomic(structhdr_histogram*h, int64_tvalue)
@@ -498,7 +541,7 @@ bool hdr_record_values(struct hdr_histogram* h, int64_t value, int64_t count)
498541
 }
499542

500543
counts_index=counts_index_for(h, value);
501-
if (counts_index<0||h->counts_len <= counts_index)
544+
if ((uint32_t)counts_index>= (uint32_t)h->counts_len)
502545
 {
503546
return false;
504547
 }
@@ -520,7 +563,7 @@ bool hdr_record_values_atomic(struct hdr_histogram* h, int64_t value, int64_t co
520563

521564
counts_index=counts_index_for(h, value);
522565

523-
if (counts_index<0||h->counts_len <= counts_index)
566+
if ((uint32_t)counts_index>= (uint32_t)h->counts_len)
524567
 {
525568
return false;
526569
 }
@@ -665,22 +708,65 @@ int64_t hdr_min(const struct hdr_histogram* h)
665708
returnnon_zero_min(h);
666709
}
667710

668-
staticint64_tget_value_from_idx_up_to_count(conststructhdr_histogram*h, int64_tcount_at_percentile)
711+
staticint64_tget_value_from_idx_up_to_count_scalar(
712+
conststructhdr_histogram*h, int64_tcount_at_percentile)
669713
{
670714
int64_tcount_to_idx=0;
671-
672-
count_at_percentile=0<count_at_percentile ? count_at_percentile : 1;
673-
for (int32_tidx=0; idx<h->counts_len; idx++)
674-
 {
715+
for (int32_tidx=0; idx<h->counts_len; idx++) {
675716
count_to_idx+=h->counts[idx];
676717
if (count_to_idx >= count_at_percentile)
677-
 {
678718
returnhdr_value_at_index(h, idx);
679-
 }
680719
 }
720+
return0;
721+
}
681722

723+
#ifdefHDR_HAS_AVX2_DISPATCH
724+
__attribute__((target("avx2")))
725+
staticint64_tget_value_from_idx_up_to_count_avx2(
726+
conststructhdr_histogram*h, int64_tcount_at_percentile)
727+
{
728+
int64_trunning=0;
729+
int32_tidx=0;
730+
constint32_tlimit=h->counts_len& ~3;
731+
732+
for (; idx<limit; idx+=4) {
733+
__m256iv=_mm256_loadu_si256((const__m256i*)&h->counts[idx]);
734+
__m128ilo=_mm256_castsi256_si128(v);
735+
__m128ihi=_mm256_extracti128_si256(v, 1);
736+
__m128is=_mm_add_epi64(lo, hi);
737+
/* Lanes are non-negative counts whose total fits in int64_t (total_count
738+
 invariant), so the chunk sum cannot overflow under valid state. Use
739+
 unsigned add to avoid signed-overflow UB if invariants are violated. */
740+
int64_tchunk= (int64_t)((uint64_t)_mm_extract_epi64(s, 0)
741+
+ (uint64_t)_mm_extract_epi64(s, 1));
742+
743+
if (__builtin_expect(running+chunk >= count_at_percentile, 0)) {
744+
for (int32_tj=idx; j<idx+4; j++) {
745+
running+=h->counts[j];
746+
if (running >= count_at_percentile)
747+
returnhdr_value_at_index(h, j);
748+
 }
749+
 }
750+
running+=chunk;
751+
 }
752+
for (; idx<h->counts_len; idx++) {
753+
running+=h->counts[idx];
754+
if (running >= count_at_percentile)
755+
returnhdr_value_at_index(h, idx);
756+
 }
682757
return0;
683758
}
759+
#endif
760+
761+
staticint64_tget_value_from_idx_up_to_count(conststructhdr_histogram*h, int64_tcount_at_percentile)
762+
{
763+
count_at_percentile=count_at_percentile>0 ? count_at_percentile : 1;
764+
#ifdefHDR_HAS_AVX2_DISPATCH
765+
if (__builtin_cpu_supports("avx2"))
766+
returnget_value_from_idx_up_to_count_avx2(h, count_at_percentile);
767+
#endif
768+
returnget_value_from_idx_up_to_count_scalar(h, count_at_percentile);
769+
}
684770

685771

686772
int64_thdr_value_at_percentile(conststructhdr_histogram*h, doublepercentile)
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit e3fa058
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update histogram to 0.11.10
PR-URL: #64296
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent e75bdb9 commit e3fa058
2 files changed
Lines changed: 103 additions & 17 deletions
File tree
‎deps/histogram/include/hdr/hdr_histogram_version.h‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
#ifndefHDR_HISTOGRAM_VERSION_H
88
#defineHDR_HISTOGRAM_VERSION_H
99

10-
#defineHDR_HISTOGRAM_VERSION "0.11.9"
10+
#defineHDR_HISTOGRAM_VERSION "0.11.10"
1111

1212
#endif// HDR_HISTOGRAM_VERSION_H
‎deps/histogram/src/hdr_histogram.c‎
Lines changed: 102 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,25 @@
2323

2424
#includeHDR_MALLOC_INCLUDE
2525

26+
/* Prefetch hint for upcoming write access */
27+
#if defined(__GNUC__) || defined(__clang__)
28+
# defineHDR_PREFETCH_WRITE(addr) __builtin_prefetch((addr), 1, 3)
29+
# defineHDR_LIKELY(x) __builtin_expect(!!(x), 1)
30+
# defineHDR_UNLIKELY(x) __builtin_expect(!!(x), 0)
31+
#else
32+
# defineHDR_PREFETCH_WRITE(addr) ((void)(addr))
33+
# defineHDR_LIKELY(x) (x)
34+
# defineHDR_UNLIKELY(x) (x)
35+
#endif
36+
37+
/* Runtime-dispatched AVX2 path: keep the rest of this TU at the project's
38+
 baseline ISA so the shipped binary does not silently require AVX2. */
39+
#if (defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86)) \
40+
&& (defined(__GNUC__) || defined(__clang__)) && !defined(__INTEL_COMPILER)
41+
# defineHDR_HAS_AVX2_DISPATCH 1
42+
# include<immintrin.h>
43+
#endif
44+
2645
/* ###### ####### ## ## ## ## ######## ###### */
2746
/* ## ## ## ## ## ## ### ## ## ## ## */
2847
/* ## ## ## ## ## #### ## ## ## */
@@ -67,24 +86,48 @@ static int64_t counts_get_normalised(const struct hdr_histogram* h, int32_t inde
6786
staticvoidcounts_inc_normalised(
6887
structhdr_histogram*h, int32_tindex, int64_tvalue)
6988
{
70-
int32_tnormalised_index=normalize_index(h, index);
71-
h->counts[normalised_index] +=value;
89+
if (HDR_LIKELY(h->normalizing_index_offset==0))
90+
 {
91+
HDR_PREFETCH_WRITE(&h->counts[index]);
92+
h->counts[index] +=value;
93+
 }
94+
else
95+
 {
96+
int32_tnormalised_index=normalize_index(h, index);
97+
HDR_PREFETCH_WRITE(&h->counts[normalised_index]);
98+
h->counts[normalised_index] +=value;
99+
 }
72100
h->total_count+=value;
73101
}
74102

75103
staticvoidcounts_inc_normalised_atomic(
76104
structhdr_histogram*h, int32_tindex, int64_tvalue)
77105
{
78-
int32_tnormalised_index=normalize_index(h, index);
79-
80-
hdr_atomic_add_fetch_64(&h->counts[normalised_index], value);
106+
if (HDR_LIKELY(h->normalizing_index_offset==0))
107+
 {
108+
HDR_PREFETCH_WRITE(&h->counts[index]);
109+
hdr_atomic_add_fetch_64(&h->counts[index], value);
110+
 }
111+
else
112+
 {
113+
int32_tnormalised_index=normalize_index(h, index);
114+
HDR_PREFETCH_WRITE(&h->counts[normalised_index]);
115+
hdr_atomic_add_fetch_64(&h->counts[normalised_index], value);
116+
 }
81117
hdr_atomic_add_fetch_64(&h->total_count, value);
82118
}
83119

84120
staticvoidupdate_min_max(structhdr_histogram*h, int64_tvalue)
85121
{
86-
h->min_value= (value<h->min_value&&value!=0) ? value : h->min_value;
87-
h->max_value= (value>h->max_value) ? value : h->max_value;
122+
if (HDR_UNLIKELY(value>h->max_value))
123+
 {
124+
h->max_value=value;
125+
 }
126+
127+
if (HDR_UNLIKELY(value!=0&&value<h->min_value))
128+
 {
129+
h->min_value=value;
130+
 }
88131
}
89132

90133
staticvoidupdate_min_max_atomic(structhdr_histogram*h, int64_tvalue)
@@ -498,7 +541,7 @@ bool hdr_record_values(struct hdr_histogram* h, int64_t value, int64_t count)
498541
 }
499542

500543
counts_index=counts_index_for(h, value);
501-
if (counts_index<0||h->counts_len <= counts_index)
544+
if ((uint32_t)counts_index>= (uint32_t)h->counts_len)
502545
 {
503546
return false;
504547
 }
@@ -520,7 +563,7 @@ bool hdr_record_values_atomic(struct hdr_histogram* h, int64_t value, int64_t co
520563

521564
counts_index=counts_index_for(h, value);
522565

523-
if (counts_index<0||h->counts_len <= counts_index)
566+
if ((uint32_t)counts_index>= (uint32_t)h->counts_len)
524567
 {
525568
return false;
526569
 }
@@ -665,22 +708,65 @@ int64_t hdr_min(const struct hdr_histogram* h)
665708
returnnon_zero_min(h);
666709
}
667710

668-
staticint64_tget_value_from_idx_up_to_count(conststructhdr_histogram*h, int64_tcount_at_percentile)
711+
staticint64_tget_value_from_idx_up_to_count_scalar(
712+
conststructhdr_histogram*h, int64_tcount_at_percentile)
669713
{
670714
int64_tcount_to_idx=0;
671-
672-
count_at_percentile=0<count_at_percentile ? count_at_percentile : 1;
673-
for (int32_tidx=0; idx<h->counts_len; idx++)
674-
 {
715+
for (int32_tidx=0; idx<h->counts_len; idx++) {
675716
count_to_idx+=h->counts[idx];
676717
if (count_to_idx >= count_at_percentile)
677-
 {
678718
returnhdr_value_at_index(h, idx);
679-
 }
680719
 }
720+
return0;
721+
}
681722

723+
#ifdefHDR_HAS_AVX2_DISPATCH
724+
__attribute__((target("avx2")))
725+
staticint64_tget_value_from_idx_up_to_count_avx2(
726+
conststructhdr_histogram*h, int64_tcount_at_percentile)
727+
{
728+
int64_trunning=0;
729+
int32_tidx=0;
730+
constint32_tlimit=h->counts_len& ~3;
731+
732+
for (; idx<limit; idx+=4) {
733+
__m256iv=_mm256_loadu_si256((const__m256i*)&h->counts[idx]);
734+
__m128ilo=_mm256_castsi256_si128(v);
735+
__m128ihi=_mm256_extracti128_si256(v, 1);
736+
__m128is=_mm_add_epi64(lo, hi);
737+
/* Lanes are non-negative counts whose total fits in int64_t (total_count
738+
 invariant), so the chunk sum cannot overflow under valid state. Use
739+
 unsigned add to avoid signed-overflow UB if invariants are violated. */
740+
int64_tchunk= (int64_t)((uint64_t)_mm_extract_epi64(s, 0)
741+
+ (uint64_t)_mm_extract_epi64(s, 1));
742+
743+
if (__builtin_expect(running+chunk >= count_at_percentile, 0)) {
744+
for (int32_tj=idx; j<idx+4; j++) {
745+
running+=h->counts[j];
746+
if (running >= count_at_percentile)
747+
returnhdr_value_at_index(h, j);
748+
 }
749+
 }
750+
running+=chunk;
751+
 }
752+
for (; idx<h->counts_len; idx++) {
753+
running+=h->counts[idx];
754+
if (running >= count_at_percentile)
755+
returnhdr_value_at_index(h, idx);
756+
 }
682757
return0;
683758
}
759+
#endif
760+
761+
staticint64_tget_value_from_idx_up_to_count(conststructhdr_histogram*h, int64_tcount_at_percentile)
762+
{
763+
count_at_percentile=count_at_percentile>0 ? count_at_percentile : 1;
764+
#ifdefHDR_HAS_AVX2_DISPATCH
765+
if (__builtin_cpu_supports("avx2"))
766+
returnget_value_from_idx_up_to_count_avx2(h, count_at_percentile);
767+
#endif
768+
returnget_value_from_idx_up_to_count_scalar(h, count_at_percentile);
769+
}
684770

685771

686772
int64_thdr_value_at_percentile(conststructhdr_histogram*h, doublepercentile)
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit e3fa058
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update histogram to 0.11.10
PR-URL: #64296
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent e75bdb9 commit e3fa058
2 files changed
Lines changed: 103 additions & 17 deletions
File tree
‎deps/histogram/include/hdr/hdr_histogram_version.h‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
#ifndefHDR_HISTOGRAM_VERSION_H
88
#defineHDR_HISTOGRAM_VERSION_H
99

10-
#defineHDR_HISTOGRAM_VERSION "0.11.9"
10+
#defineHDR_HISTOGRAM_VERSION "0.11.10"
1111

1212
#endif// HDR_HISTOGRAM_VERSION_H
‎deps/histogram/src/hdr_histogram.c‎
Lines changed: 102 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,25 @@
2323

2424
#includeHDR_MALLOC_INCLUDE
2525

26+
/* Prefetch hint for upcoming write access */
27+
#if defined(__GNUC__) || defined(__clang__)
28+
# defineHDR_PREFETCH_WRITE(addr) __builtin_prefetch((addr), 1, 3)
29+
# defineHDR_LIKELY(x) __builtin_expect(!!(x), 1)
30+
# defineHDR_UNLIKELY(x) __builtin_expect(!!(x), 0)
31+
#else
32+
# defineHDR_PREFETCH_WRITE(addr) ((void)(addr))
33+
# defineHDR_LIKELY(x) (x)
34+
# defineHDR_UNLIKELY(x) (x)
35+
#endif
36+
37+
/* Runtime-dispatched AVX2 path: keep the rest of this TU at the project's
38+
 baseline ISA so the shipped binary does not silently require AVX2. */
39+
#if (defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86)) \
40+
&& (defined(__GNUC__) || defined(__clang__)) && !defined(__INTEL_COMPILER)
41+
# defineHDR_HAS_AVX2_DISPATCH 1
42+
# include<immintrin.h>
43+
#endif
44+
2645
/* ###### ####### ## ## ## ## ######## ###### */
2746
/* ## ## ## ## ## ## ### ## ## ## ## */
2847
/* ## ## ## ## ## #### ## ## ## */
@@ -67,24 +86,48 @@ static int64_t counts_get_normalised(const struct hdr_histogram* h, int32_t inde
6786
staticvoidcounts_inc_normalised(
6887
structhdr_histogram*h, int32_tindex, int64_tvalue)
6988
{
70-
int32_tnormalised_index=normalize_index(h, index);
71-
h->counts[normalised_index] +=value;
89+
if (HDR_LIKELY(h->normalizing_index_offset==0))
90+
 {
91+
HDR_PREFETCH_WRITE(&h->counts[index]);
92+
h->counts[index] +=value;
93+
 }
94+
else
95+
 {
96+
int32_tnormalised_index=normalize_index(h, index);
97+
HDR_PREFETCH_WRITE(&h->counts[normalised_index]);
98+
h->counts[normalised_index] +=value;
99+
 }
72100
h->total_count+=value;
73101
}
74102

75103
staticvoidcounts_inc_normalised_atomic(
76104
structhdr_histogram*h, int32_tindex, int64_tvalue)
77105
{
78-
int32_tnormalised_index=normalize_index(h, index);
79-
80-
hdr_atomic_add_fetch_64(&h->counts[normalised_index], value);
106+
if (HDR_LIKELY(h->normalizing_index_offset==0))
107+
 {
108+
HDR_PREFETCH_WRITE(&h->counts[index]);
109+
hdr_atomic_add_fetch_64(&h->counts[index], value);
110+
 }
111+
else
112+
 {
113+
int32_tnormalised_index=normalize_index(h, index);
114+
HDR_PREFETCH_WRITE(&h->counts[normalised_index]);
115+
hdr_atomic_add_fetch_64(&h->counts[normalised_index], value);
116+
 }
81117
hdr_atomic_add_fetch_64(&h->total_count, value);
82118
}
83119

84120
staticvoidupdate_min_max(structhdr_histogram*h, int64_tvalue)
85121
{
86-
h->min_value= (value<h->min_value&&value!=0) ? value : h->min_value;
87-
h->max_value= (value>h->max_value) ? value : h->max_value;
122+
if (HDR_UNLIKELY(value>h->max_value))
123+
 {
124+
h->max_value=value;
125+
 }
126+
127+
if (HDR_UNLIKELY(value!=0&&value<h->min_value))
128+
 {
129+
h->min_value=value;
130+
 }
88131
}
89132

90133
staticvoidupdate_min_max_atomic(structhdr_histogram*h, int64_tvalue)
@@ -498,7 +541,7 @@ bool hdr_record_values(struct hdr_histogram* h, int64_t value, int64_t count)
498541
 }
499542

500543
counts_index=counts_index_for(h, value);
501-
if (counts_index<0||h->counts_len <= counts_index)
544+
if ((uint32_t)counts_index>= (uint32_t)h->counts_len)
502545
 {
503546
return false;
504547
 }
@@ -520,7 +563,7 @@ bool hdr_record_values_atomic(struct hdr_histogram* h, int64_t value, int64_t co
520563

521564
counts_index=counts_index_for(h, value);
522565

523-
if (counts_index<0||h->counts_len <= counts_index)
566+
if ((uint32_t)counts_index>= (uint32_t)h->counts_len)
524567
 {
525568
return false;
526569
 }
@@ -665,22 +708,65 @@ int64_t hdr_min(const struct hdr_histogram* h)
665708
returnnon_zero_min(h);
666709
}
667710

668-
staticint64_tget_value_from_idx_up_to_count(conststructhdr_histogram*h, int64_tcount_at_percentile)
711+
staticint64_tget_value_from_idx_up_to_count_scalar(
712+
conststructhdr_histogram*h, int64_tcount_at_percentile)
669713
{
670714
int64_tcount_to_idx=0;
671-
672-
count_at_percentile=0<count_at_percentile ? count_at_percentile : 1;
673-
for (int32_tidx=0; idx<h->counts_len; idx++)
674-
 {
715+
for (int32_tidx=0; idx<h->counts_len; idx++) {
675716
count_to_idx+=h->counts[idx];
676717
if (count_to_idx >= count_at_percentile)
677-
 {
678718
returnhdr_value_at_index(h, idx);
679-
 }
680719
 }
720+
return0;
721+
}
681722

723+
#ifdefHDR_HAS_AVX2_DISPATCH
724+
__attribute__((target("avx2")))
725+
staticint64_tget_value_from_idx_up_to_count_avx2(
726+
conststructhdr_histogram*h, int64_tcount_at_percentile)
727+
{
728+
int64_trunning=0;
729+
int32_tidx=0;
730+
constint32_tlimit=h->counts_len& ~3;
731+
732+
for (; idx<limit; idx+=4) {
733+
__m256iv=_mm256_loadu_si256((const__m256i*)&h->counts[idx]);
734+
__m128ilo=_mm256_castsi256_si128(v);
735+
__m128ihi=_mm256_extracti128_si256(v, 1);
736+
__m128is=_mm_add_epi64(lo, hi);
737+
/* Lanes are non-negative counts whose total fits in int64_t (total_count
738+
 invariant), so the chunk sum cannot overflow under valid state. Use
739+
 unsigned add to avoid signed-overflow UB if invariants are violated. */
740+
int64_tchunk= (int64_t)((uint64_t)_mm_extract_epi64(s, 0)
741+
+ (uint64_t)_mm_extract_epi64(s, 1));
742+
743+
if (__builtin_expect(running+chunk >= count_at_percentile, 0)) {
744+
for (int32_tj=idx; j<idx+4; j++) {
745+
running+=h->counts[j];
746+
if (running >= count_at_percentile)
747+
returnhdr_value_at_index(h, j);
748+
 }
749+
 }
750+
running+=chunk;
751+
 }
752+
for (; idx<h->counts_len; idx++) {
753+
running+=h->counts[idx];
754+
if (running >= count_at_percentile)
755+
returnhdr_value_at_index(h, idx);
756+
 }
682757
return0;
683758
}
759+
#endif
760+
761+
staticint64_tget_value_from_idx_up_to_count(conststructhdr_histogram*h, int64_tcount_at_percentile)
762+
{
763+
count_at_percentile=count_at_percentile>0 ? count_at_percentile : 1;
764+
#ifdefHDR_HAS_AVX2_DISPATCH
765+
if (__builtin_cpu_supports("avx2"))
766+
returnget_value_from_idx_up_to_count_avx2(h, count_at_percentile);
767+
#endif
768+
returnget_value_from_idx_up_to_count_scalar(h, count_at_percentile);
769+
}
684770

685771

686772
int64_thdr_value_at_percentile(conststructhdr_histogram*h, doublepercentile)
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit e3fa058
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update histogram to 0.11.10
PR-URL: #64296
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent e75bdb9 commit e3fa058
2 files changed
Lines changed: 103 additions & 17 deletions
File tree
‎deps/histogram/include/hdr/hdr_histogram_version.h‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
#ifndefHDR_HISTOGRAM_VERSION_H
88
#defineHDR_HISTOGRAM_VERSION_H
99

10-
#defineHDR_HISTOGRAM_VERSION "0.11.9"
10+
#defineHDR_HISTOGRAM_VERSION "0.11.10"
1111

1212
#endif// HDR_HISTOGRAM_VERSION_H
‎deps/histogram/src/hdr_histogram.c‎
Lines changed: 102 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,25 @@
2323

2424
#includeHDR_MALLOC_INCLUDE
2525

26+
/* Prefetch hint for upcoming write access */
27+
#if defined(__GNUC__) || defined(__clang__)
28+
# defineHDR_PREFETCH_WRITE(addr) __builtin_prefetch((addr), 1, 3)
29+
# defineHDR_LIKELY(x) __builtin_expect(!!(x), 1)
30+
# defineHDR_UNLIKELY(x) __builtin_expect(!!(x), 0)
31+
#else
32+
# defineHDR_PREFETCH_WRITE(addr) ((void)(addr))
33+
# defineHDR_LIKELY(x) (x)
34+
# defineHDR_UNLIKELY(x) (x)
35+
#endif
36+
37+
/* Runtime-dispatched AVX2 path: keep the rest of this TU at the project's
38+
 baseline ISA so the shipped binary does not silently require AVX2. */
39+
#if (defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86)) \
40+
&& (defined(__GNUC__) || defined(__clang__)) && !defined(__INTEL_COMPILER)
41+
# defineHDR_HAS_AVX2_DISPATCH 1
42+
# include<immintrin.h>
43+
#endif
44+
2645
/* ###### ####### ## ## ## ## ######## ###### */
2746
/* ## ## ## ## ## ## ### ## ## ## ## */
2847
/* ## ## ## ## ## #### ## ## ## */
@@ -67,24 +86,48 @@ static int64_t counts_get_normalised(const struct hdr_histogram* h, int32_t inde
6786
staticvoidcounts_inc_normalised(
6887
structhdr_histogram*h, int32_tindex, int64_tvalue)
6988
{
70-
int32_tnormalised_index=normalize_index(h, index);
71-
h->counts[normalised_index] +=value;
89+
if (HDR_LIKELY(h->normalizing_index_offset==0))
90+
 {
91+
HDR_PREFETCH_WRITE(&h->counts[index]);
92+
h->counts[index] +=value;
93+
 }
94+
else
95+
 {
96+
int32_tnormalised_index=normalize_index(h, index);
97+
HDR_PREFETCH_WRITE(&h->counts[normalised_index]);
98+
h->counts[normalised_index] +=value;
99+
 }
72100
h->total_count+=value;
73101
}
74102

75103
staticvoidcounts_inc_normalised_atomic(
76104
structhdr_histogram*h, int32_tindex, int64_tvalue)
77105
{
78-
int32_tnormalised_index=normalize_index(h, index);
79-
80-
hdr_atomic_add_fetch_64(&h->counts[normalised_index], value);
106+
if (HDR_LIKELY(h->normalizing_index_offset==0))
107+
 {
108+
HDR_PREFETCH_WRITE(&h->counts[index]);
109+
hdr_atomic_add_fetch_64(&h->counts[index], value);
110+
 }
111+
else
112+
 {
113+
int32_tnormalised_index=normalize_index(h, index);
114+
HDR_PREFETCH_WRITE(&h->counts[normalised_index]);
115+
hdr_atomic_add_fetch_64(&h->counts[normalised_index], value);
116+
 }
81117
hdr_atomic_add_fetch_64(&h->total_count, value);
82118
}
83119

84120
staticvoidupdate_min_max(structhdr_histogram*h, int64_tvalue)
85121
{
86-
h->min_value= (value<h->min_value&&value!=0) ? value : h->min_value;
87-
h->max_value= (value>h->max_value) ? value : h->max_value;
122+
if (HDR_UNLIKELY(value>h->max_value))
123+
 {
124+
h->max_value=value;
125+
 }
126+
127+
if (HDR_UNLIKELY(value!=0&&value<h->min_value))
128+
 {
129+
h->min_value=value;
130+
 }
88131
}
89132

90133
staticvoidupdate_min_max_atomic(structhdr_histogram*h, int64_tvalue)
@@ -498,7 +541,7 @@ bool hdr_record_values(struct hdr_histogram* h, int64_t value, int64_t count)
498541
 }
499542

500543
counts_index=counts_index_for(h, value);
501-
if (counts_index<0||h->counts_len <= counts_index)
544+
if ((uint32_t)counts_index>= (uint32_t)h->counts_len)
502545
 {
503546
return false;
504547
 }
@@ -520,7 +563,7 @@ bool hdr_record_values_atomic(struct hdr_histogram* h, int64_t value, int64_t co
520563

521564
counts_index=counts_index_for(h, value);
522565

523-
if (counts_index<0||h->counts_len <= counts_index)
566+
if ((uint32_t)counts_index>= (uint32_t)h->counts_len)
524567
 {
525568
return false;
526569
 }
@@ -665,22 +708,65 @@ int64_t hdr_min(const struct hdr_histogram* h)
665708
returnnon_zero_min(h);
666709
}
667710

668-
staticint64_tget_value_from_idx_up_to_count(conststructhdr_histogram*h, int64_tcount_at_percentile)
711+
staticint64_tget_value_from_idx_up_to_count_scalar(
712+
conststructhdr_histogram*h, int64_tcount_at_percentile)
669713
{
670714
int64_tcount_to_idx=0;
671-
672-
count_at_percentile=0<count_at_percentile ? count_at_percentile : 1;
673-
for (int32_tidx=0; idx<h->counts_len; idx++)
674-
 {
715+
for (int32_tidx=0; idx<h->counts_len; idx++) {
675716
count_to_idx+=h->counts[idx];
676717
if (count_to_idx >= count_at_percentile)
677-
 {
678718
returnhdr_value_at_index(h, idx);
679-
 }
680719
 }
720+
return0;
721+
}
681722

723+
#ifdefHDR_HAS_AVX2_DISPATCH
724+
__attribute__((target("avx2")))
725+
staticint64_tget_value_from_idx_up_to_count_avx2(
726+
conststructhdr_histogram*h, int64_tcount_at_percentile)
727+
{
728+
int64_trunning=0;
729+
int32_tidx=0;
730+
constint32_tlimit=h->counts_len& ~3;
731+
732+
for (; idx<limit; idx+=4) {
733+
__m256iv=_mm256_loadu_si256((const__m256i*)&h->counts[idx]);
734+
__m128ilo=_mm256_castsi256_si128(v);
735+
__m128ihi=_mm256_extracti128_si256(v, 1);
736+
__m128is=_mm_add_epi64(lo, hi);
737+
/* Lanes are non-negative counts whose total fits in int64_t (total_count
738+
 invariant), so the chunk sum cannot overflow under valid state. Use
739+
 unsigned add to avoid signed-overflow UB if invariants are violated. */
740+
int64_tchunk= (int64_t)((uint64_t)_mm_extract_epi64(s, 0)
741+
+ (uint64_t)_mm_extract_epi64(s, 1));
742+
743+
if (__builtin_expect(running+chunk >= count_at_percentile, 0)) {
744+
for (int32_tj=idx; j<idx+4; j++) {
745+
running+=h->counts[j];
746+
if (running >= count_at_percentile)
747+
returnhdr_value_at_index(h, j);
748+
 }
749+
 }
750+
running+=chunk;
751+
 }
752+
for (; idx<h->counts_len; idx++) {
753+
running+=h->counts[idx];
754+
if (running >= count_at_percentile)
755+
returnhdr_value_at_index(h, idx);
756+
 }
682757
return0;
683758
}
759+
#endif
760+
761+
staticint64_tget_value_from_idx_up_to_count(conststructhdr_histogram*h, int64_tcount_at_percentile)
762+
{
763+
count_at_percentile=count_at_percentile>0 ? count_at_percentile : 1;
764+
#ifdefHDR_HAS_AVX2_DISPATCH
765+
if (__builtin_cpu_supports("avx2"))
766+
returnget_value_from_idx_up_to_count_avx2(h, count_at_percentile);
767+
#endif
768+
returnget_value_from_idx_up_to_count_scalar(h, count_at_percentile);
769+
}
684770

685771

686772
int64_thdr_value_at_percentile(conststructhdr_histogram*h, doublepercentile)
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit e3fa058
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update histogram to 0.11.10
PR-URL: #64296
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent e75bdb9 commit e3fa058
2 files changed
Lines changed: 103 additions & 17 deletions
File tree
‎deps/histogram/include/hdr/hdr_histogram_version.h‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
#ifndefHDR_HISTOGRAM_VERSION_H
88
#defineHDR_HISTOGRAM_VERSION_H
99

10-
#defineHDR_HISTOGRAM_VERSION "0.11.9"
10+
#defineHDR_HISTOGRAM_VERSION "0.11.10"
1111

1212
#endif// HDR_HISTOGRAM_VERSION_H
‎deps/histogram/src/hdr_histogram.c‎
Lines changed: 102 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,25 @@
2323

2424
#includeHDR_MALLOC_INCLUDE
2525

26+
/* Prefetch hint for upcoming write access */
27+
#if defined(__GNUC__) || defined(__clang__)
28+
# defineHDR_PREFETCH_WRITE(addr) __builtin_prefetch((addr), 1, 3)
29+
# defineHDR_LIKELY(x) __builtin_expect(!!(x), 1)
30+
# defineHDR_UNLIKELY(x) __builtin_expect(!!(x), 0)
31+
#else
32+
# defineHDR_PREFETCH_WRITE(addr) ((void)(addr))
33+
# defineHDR_LIKELY(x) (x)
34+
# defineHDR_UNLIKELY(x) (x)
35+
#endif
36+
37+
/* Runtime-dispatched AVX2 path: keep the rest of this TU at the project's
38+
 baseline ISA so the shipped binary does not silently require AVX2. */
39+
#if (defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86)) \
40+
&& (defined(__GNUC__) || defined(__clang__)) && !defined(__INTEL_COMPILER)
41+
# defineHDR_HAS_AVX2_DISPATCH 1
42+
# include<immintrin.h>
43+
#endif
44+
2645
/* ###### ####### ## ## ## ## ######## ###### */
2746
/* ## ## ## ## ## ## ### ## ## ## ## */
2847
/* ## ## ## ## ## #### ## ## ## */
@@ -67,24 +86,48 @@ static int64_t counts_get_normalised(const struct hdr_histogram* h, int32_t inde
6786
staticvoidcounts_inc_normalised(
6887
structhdr_histogram*h, int32_tindex, int64_tvalue)
6988
{
70-
int32_tnormalised_index=normalize_index(h, index);
71-
h->counts[normalised_index] +=value;
89+
if (HDR_LIKELY(h->normalizing_index_offset==0))
90+
 {
91+
HDR_PREFETCH_WRITE(&h->counts[index]);
92+
h->counts[index] +=value;
93+
 }
94+
else
95+
 {
96+
int32_tnormalised_index=normalize_index(h, index);
97+
HDR_PREFETCH_WRITE(&h->counts[normalised_index]);
98+
h->counts[normalised_index] +=value;
99+
 }
72100
h->total_count+=value;
73101
}
74102

75103
staticvoidcounts_inc_normalised_atomic(
76104
structhdr_histogram*h, int32_tindex, int64_tvalue)
77105
{
78-
int32_tnormalised_index=normalize_index(h, index);
79-
80-
hdr_atomic_add_fetch_64(&h->counts[normalised_index], value);
106+
if (HDR_LIKELY(h->normalizing_index_offset==0))
107+
 {
108+
HDR_PREFETCH_WRITE(&h->counts[index]);
109+
hdr_atomic_add_fetch_64(&h->counts[index], value);
110+
 }
111+
else
112+
 {
113+
int32_tnormalised_index=normalize_index(h, index);
114+
HDR_PREFETCH_WRITE(&h->counts[normalised_index]);
115+
hdr_atomic_add_fetch_64(&h->counts[normalised_index], value);
116+
 }
81117
hdr_atomic_add_fetch_64(&h->total_count, value);
82118
}
83119

84120
staticvoidupdate_min_max(structhdr_histogram*h, int64_tvalue)
85121
{
86-
h->min_value= (value<h->min_value&&value!=0) ? value : h->min_value;
87-
h->max_value= (value>h->max_value) ? value : h->max_value;
122+
if (HDR_UNLIKELY(value>h->max_value))
123+
 {
124+
h->max_value=value;
125+
 }
126+
127+
if (HDR_UNLIKELY(value!=0&&value<h->min_value))
128+
 {
129+
h->min_value=value;
130+
 }
88131
}
89132

90133
staticvoidupdate_min_max_atomic(structhdr_histogram*h, int64_tvalue)
@@ -498,7 +541,7 @@ bool hdr_record_values(struct hdr_histogram* h, int64_t value, int64_t count)
498541
 }
499542

500543
counts_index=counts_index_for(h, value);
501-
if (counts_index<0||h->counts_len <= counts_index)
544+
if ((uint32_t)counts_index>= (uint32_t)h->counts_len)
502545
 {
503546
return false;
504547
 }
@@ -520,7 +563,7 @@ bool hdr_record_values_atomic(struct hdr_histogram* h, int64_t value, int64_t co
520563

521564
counts_index=counts_index_for(h, value);
522565

523-
if (counts_index<0||h->counts_len <= counts_index)
566+
if ((uint32_t)counts_index>= (uint32_t)h->counts_len)
524567
 {
525568
return false;
526569
 }
@@ -665,22 +708,65 @@ int64_t hdr_min(const struct hdr_histogram* h)
665708
returnnon_zero_min(h);
666709
}
667710

668-
staticint64_tget_value_from_idx_up_to_count(conststructhdr_histogram*h, int64_tcount_at_percentile)
711+
staticint64_tget_value_from_idx_up_to_count_scalar(
712+
conststructhdr_histogram*h, int64_tcount_at_percentile)
669713
{
670714
int64_tcount_to_idx=0;
671-
672-
count_at_percentile=0<count_at_percentile ? count_at_percentile : 1;
673-
for (int32_tidx=0; idx<h->counts_len; idx++)
674-
 {
715+
for (int32_tidx=0; idx<h->counts_len; idx++) {
675716
count_to_idx+=h->counts[idx];
676717
if (count_to_idx >= count_at_percentile)
677-
 {
678718
returnhdr_value_at_index(h, idx);
679-
 }
680719
 }
720+
return0;
721+
}
681722

723+
#ifdefHDR_HAS_AVX2_DISPATCH
724+
__attribute__((target("avx2")))
725+
staticint64_tget_value_from_idx_up_to_count_avx2(
726+
conststructhdr_histogram*h, int64_tcount_at_percentile)
727+
{
728+
int64_trunning=0;
729+
int32_tidx=0;
730+
constint32_tlimit=h->counts_len& ~3;
731+
732+
for (; idx<limit; idx+=4) {
733+
__m256iv=_mm256_loadu_si256((const__m256i*)&h->counts[idx]);
734+
__m128ilo=_mm256_castsi256_si128(v);
735+
__m128ihi=_mm256_extracti128_si256(v, 1);
736+
__m128is=_mm_add_epi64(lo, hi);
737+
/* Lanes are non-negative counts whose total fits in int64_t (total_count
738+
 invariant), so the chunk sum cannot overflow under valid state. Use
739+
 unsigned add to avoid signed-overflow UB if invariants are violated. */
740+
int64_tchunk= (int64_t)((uint64_t)_mm_extract_epi64(s, 0)
741+
+ (uint64_t)_mm_extract_epi64(s, 1));
742+
743+
if (__builtin_expect(running+chunk >= count_at_percentile, 0)) {
744+
for (int32_tj=idx; j<idx+4; j++) {
745+
running+=h->counts[j];
746+
if (running >= count_at_percentile)
747+
returnhdr_value_at_index(h, j);
748+
 }
749+
 }
750+
running+=chunk;
751+
 }
752+
for (; idx<h->counts_len; idx++) {
753+
running+=h->counts[idx];
754+
if (running >= count_at_percentile)
755+
returnhdr_value_at_index(h, idx);
756+
 }
682757
return0;
683758
}
759+
#endif
760+
761+
staticint64_tget_value_from_idx_up_to_count(conststructhdr_histogram*h, int64_tcount_at_percentile)
762+
{
763+
count_at_percentile=count_at_percentile>0 ? count_at_percentile : 1;
764+
#ifdefHDR_HAS_AVX2_DISPATCH
765+
if (__builtin_cpu_supports("avx2"))
766+
returnget_value_from_idx_up_to_count_avx2(h, count_at_percentile);
767+
#endif
768+
returnget_value_from_idx_up_to_count_scalar(h, count_at_percentile);
769+
}
684770

685771

686772
int64_thdr_value_at_percentile(conststructhdr_histogram*h, doublepercentile)
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit e3fa058
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update histogram to 0.11.10
PR-URL: #64296
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent e75bdb9 commit e3fa058
2 files changed
Lines changed: 103 additions & 17 deletions
File tree
‎deps/histogram/include/hdr/hdr_histogram_version.h‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
#ifndefHDR_HISTOGRAM_VERSION_H
88
#defineHDR_HISTOGRAM_VERSION_H
99

10-
#defineHDR_HISTOGRAM_VERSION "0.11.9"
10+
#defineHDR_HISTOGRAM_VERSION "0.11.10"
1111

1212
#endif// HDR_HISTOGRAM_VERSION_H
‎deps/histogram/src/hdr_histogram.c‎
Lines changed: 102 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,25 @@
2323

2424
#includeHDR_MALLOC_INCLUDE
2525

26+
/* Prefetch hint for upcoming write access */
27+
#if defined(__GNUC__) || defined(__clang__)
28+
# defineHDR_PREFETCH_WRITE(addr) __builtin_prefetch((addr), 1, 3)
29+
# defineHDR_LIKELY(x) __builtin_expect(!!(x), 1)
30+
# defineHDR_UNLIKELY(x) __builtin_expect(!!(x), 0)
31+
#else
32+
# defineHDR_PREFETCH_WRITE(addr) ((void)(addr))
33+
# defineHDR_LIKELY(x) (x)
34+
# defineHDR_UNLIKELY(x) (x)
35+
#endif
36+
37+
/* Runtime-dispatched AVX2 path: keep the rest of this TU at the project's
38+
 baseline ISA so the shipped binary does not silently require AVX2. */
39+
#if (defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86)) \
40+
&& (defined(__GNUC__) || defined(__clang__)) && !defined(__INTEL_COMPILER)
41+
# defineHDR_HAS_AVX2_DISPATCH 1
42+
# include<immintrin.h>
43+
#endif
44+
2645
/* ###### ####### ## ## ## ## ######## ###### */
2746
/* ## ## ## ## ## ## ### ## ## ## ## */
2847
/* ## ## ## ## ## #### ## ## ## */
@@ -67,24 +86,48 @@ static int64_t counts_get_normalised(const struct hdr_histogram* h, int32_t inde
6786
staticvoidcounts_inc_normalised(
6887
structhdr_histogram*h, int32_tindex, int64_tvalue)
6988
{
70-
int32_tnormalised_index=normalize_index(h, index);
71-
h->counts[normalised_index] +=value;
89+
if (HDR_LIKELY(h->normalizing_index_offset==0))
90+
 {
91+
HDR_PREFETCH_WRITE(&h->counts[index]);
92+
h->counts[index] +=value;
93+
 }
94+
else
95+
 {
96+
int32_tnormalised_index=normalize_index(h, index);
97+
HDR_PREFETCH_WRITE(&h->counts[normalised_index]);
98+
h->counts[normalised_index] +=value;
99+
 }
72100
h->total_count+=value;
73101
}
74102

75103
staticvoidcounts_inc_normalised_atomic(
76104
structhdr_histogram*h, int32_tindex, int64_tvalue)
77105
{
78-
int32_tnormalised_index=normalize_index(h, index);
79-
80-
hdr_atomic_add_fetch_64(&h->counts[normalised_index], value);
106+
if (HDR_LIKELY(h->normalizing_index_offset==0))
107+
 {
108+
HDR_PREFETCH_WRITE(&h->counts[index]);
109+
hdr_atomic_add_fetch_64(&h->counts[index], value);
110+
 }
111+
else
112+
 {
113+
int32_tnormalised_index=normalize_index(h, index);
114+
HDR_PREFETCH_WRITE(&h->counts[normalised_index]);
115+
hdr_atomic_add_fetch_64(&h->counts[normalised_index], value);
116+
 }
81117
hdr_atomic_add_fetch_64(&h->total_count, value);
82118
}
83119

84120
staticvoidupdate_min_max(structhdr_histogram*h, int64_tvalue)
85121
{
86-
h->min_value= (value<h->min_value&&value!=0) ? value : h->min_value;
87-
h->max_value= (value>h->max_value) ? value : h->max_value;
122+
if (HDR_UNLIKELY(value>h->max_value))
123+
 {
124+
h->max_value=value;
125+
 }
126+
127+
if (HDR_UNLIKELY(value!=0&&value<h->min_value))
128+
 {
129+
h->min_value=value;
130+
 }
88131
}
89132

90133
staticvoidupdate_min_max_atomic(structhdr_histogram*h, int64_tvalue)
@@ -498,7 +541,7 @@ bool hdr_record_values(struct hdr_histogram* h, int64_t value, int64_t count)
498541
 }
499542

500543
counts_index=counts_index_for(h, value);
501-
if (counts_index<0||h->counts_len <= counts_index)
544+
if ((uint32_t)counts_index>= (uint32_t)h->counts_len)
502545
 {
503546
return false;
504547
 }
@@ -520,7 +563,7 @@ bool hdr_record_values_atomic(struct hdr_histogram* h, int64_t value, int64_t co
520563

521564
counts_index=counts_index_for(h, value);
522565

523-
if (counts_index<0||h->counts_len <= counts_index)
566+
if ((uint32_t)counts_index>= (uint32_t)h->counts_len)
524567
 {
525568
return false;
526569
 }
@@ -665,22 +708,65 @@ int64_t hdr_min(const struct hdr_histogram* h)
665708
returnnon_zero_min(h);
666709
}
667710

668-
staticint64_tget_value_from_idx_up_to_count(conststructhdr_histogram*h, int64_tcount_at_percentile)
711+
staticint64_tget_value_from_idx_up_to_count_scalar(
712+
conststructhdr_histogram*h, int64_tcount_at_percentile)
669713
{
670714
int64_tcount_to_idx=0;
671-
672-
count_at_percentile=0<count_at_percentile ? count_at_percentile : 1;
673-
for (int32_tidx=0; idx<h->counts_len; idx++)
674-
 {
715+
for (int32_tidx=0; idx<h->counts_len; idx++) {
675716
count_to_idx+=h->counts[idx];
676717
if (count_to_idx >= count_at_percentile)
677-
 {
678718
returnhdr_value_at_index(h, idx);
679-
 }
680719
 }
720+
return0;
721+
}
681722

723+
#ifdefHDR_HAS_AVX2_DISPATCH
724+
__attribute__((target("avx2")))
725+
staticint64_tget_value_from_idx_up_to_count_avx2(
726+
conststructhdr_histogram*h, int64_tcount_at_percentile)
727+
{
728+
int64_trunning=0;
729+
int32_tidx=0;
730+
constint32_tlimit=h->counts_len& ~3;
731+
732+
for (; idx<limit; idx+=4) {
733+
__m256iv=_mm256_loadu_si256((const__m256i*)&h->counts[idx]);
734+
__m128ilo=_mm256_castsi256_si128(v);
735+
__m128ihi=_mm256_extracti128_si256(v, 1);
736+
__m128is=_mm_add_epi64(lo, hi);
737+
/* Lanes are non-negative counts whose total fits in int64_t (total_count
738+
 invariant), so the chunk sum cannot overflow under valid state. Use
739+
 unsigned add to avoid signed-overflow UB if invariants are violated. */
740+
int64_tchunk= (int64_t)((uint64_t)_mm_extract_epi64(s, 0)
741+
+ (uint64_t)_mm_extract_epi64(s, 1));
742+
743+
if (__builtin_expect(running+chunk >= count_at_percentile, 0)) {
744+
for (int32_tj=idx; j<idx+4; j++) {
745+
running+=h->counts[j];
746+
if (running >= count_at_percentile)
747+
returnhdr_value_at_index(h, j);
748+
 }
749+
 }
750+
running+=chunk;
751+
 }
752+
for (; idx<h->counts_len; idx++) {
753+
running+=h->counts[idx];
754+
if (running >= count_at_percentile)
755+
returnhdr_value_at_index(h, idx);
756+
 }
682757
return0;
683758
}
759+
#endif
760+
761+
staticint64_tget_value_from_idx_up_to_count(conststructhdr_histogram*h, int64_tcount_at_percentile)
762+
{
763+
count_at_percentile=count_at_percentile>0 ? count_at_percentile : 1;
764+
#ifdefHDR_HAS_AVX2_DISPATCH
765+
if (__builtin_cpu_supports("avx2"))
766+
returnget_value_from_idx_up_to_count_avx2(h, count_at_percentile);
767+
#endif
768+
returnget_value_from_idx_up_to_count_scalar(h, count_at_percentile);
769+
}
684770

685771

686772
int64_thdr_value_at_percentile(conststructhdr_histogram*h, doublepercentile)
0 commit comments
Comments
 (0)