Skip to content

Commit b4fa799

Browse files
committed
util: remove x86intrin.h dependency
Improves build times
1 parent 7727dcd commit b4fa799

File tree

14 files changed

+22
-3
lines changed

14 files changed

+22
-3
lines changed

src/ballet/bigint/fd_uint256_mul.h

+4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
#define OPTIMIZE
2626
#endif
2727

28+
#if FD_HAS_X86
29+
#include <x86intrin.h>
30+
#endif
31+
2832
/* Utility functions for fd_uint256_mul_mod_p.
2933
Implementation is based on uint128.
3034
The implementations WITHOUT uint128 are just for completeness, we

src/ballet/toml/fd_toml.c

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include "fd_toml.h"
33
#include "../../util/fd_util.h"
44
#include <ctype.h>
5+
#include <math.h>
56
#include <time.h>
67

78
/* Implementation note:

src/disco/metrics/fd_metrics.h

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "generated/fd_metrics_all.h"
77

88
#include "../../tango/tempo/fd_tempo.h"
9+
#include "../../util/hist/fd_histf.h"
910

1011
/* fd_metrics mostly defines way of laying out metrics in shared
1112
memory so that a producer and consumer can agree on where they

src/disco/pack/fd_pack_rebate_sum.c

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#include "fd_pack_rebate_sum.h"
22
#include "fd_pack.h"
3+
#if FD_HAS_AVX
4+
#include "../../util/simd/fd_avx.h"
5+
#endif
36

47
static const fd_acct_addr_t null_addr = { 0 };
58

src/disco/pack/test_chkdup.c

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#define FD_UNALIGNED_ACCESS_STYLE 0
22
#include "fd_chkdup.h"
3+
#include <math.h>
34

45
#define P 4294967291UL /* A prime that fits in a uint with 2 as a primitive root */
56

src/discof/poh/fd_poh.h

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include "../../disco/tiles.h"
55
#include "../../disco/shred/fd_stake_ci.h"
6+
#include "../../util/hist/fd_histf.h"
67

78
/* Common library functions for the Proof of History tile. */
89

src/discoh/resolv/fd_resolv_tile.c

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
#include "../../flamenco/runtime/fd_system_ids.h"
77
#include "../../flamenco/runtime/fd_system_ids_pp.h"
88

9+
#if FD_HAS_AVX
10+
#include "../../util/simd/fd_avx.h"
11+
#endif
12+
913
#define FD_RESOLV_IN_KIND_FRAGMENT (0)
1014
#define FD_RESOLV_IN_KIND_BANK (1)
1115

src/flamenco/gossip/fd_gossip.c

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include "fd_gossip.h"
22
#include "../../ballet/base58/fd_base58.h"
33
#include "../../disco/keyguard/fd_keyguard.h"
4+
#include <math.h>
45

56
/* Maximum size of a network packet */
67
#define PACKET_DATA_SIZE 1232

src/flamenco/runtime/fd_acc_mgr.h

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "../fd_flamenco_base.h"
77
#include "../../ballet/txn/fd_txn.h"
88
#include "fd_txn_account.h"
9+
#include "../../util/simd/fd_avx.h"
910

1011
/* FD_ACC_MGR_{SUCCESS,ERR{...}} are account management specific error codes.
1112
To be stored in an int. */

src/flamenco/runtime/fd_executor.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,11 @@
3131
#include "../../ballet/base58/fd_base58.h"
3232
#include "../../disco/pack/fd_pack.h"
3333
#include "../../disco/pack/fd_pack_cost.h"
34-
#include "../../ballet/sbpf/fd_sbpf_loader.h"
3534

3635
#include "../../util/bits/fd_uwide.h"
3736

3837
#include <assert.h>
39-
#include <errno.h>
38+
#include <math.h>
4039
#include <stdio.h> /* snprintf(3) */
4140
#include <fcntl.h> /* openat(2) */
4241
#include <unistd.h> /* write(3) */

src/funk/bench_funk_index.c

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "fd_funk.h"
22
#include "fd_funk_base.h"
3+
#include <math.h>
34

45
#define FUNK_TAG 1UL
56

src/util/fd_util.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "sandbox/fd_sandbox.h" /* includes fd_util_base.h */
2727
#include "math/fd_stat.h" /* includes bits/fd_bits.h */
2828
#include "bits/fd_sat.h" /* includes bits/fd_bits.h */
29-
#include "hist/fd_histf.h" /* includes log/fd_log.h */
29+
//#include "hist/fd_histf.h" /* includes log/fd_log.h */
3030

3131
/* Additional fd_util APIs that are not included by default */
3232

src/waltz/quic/fd_quic.h

+1
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686

8787
#include "../aio/fd_aio.h"
8888
#include "../tls/fd_tls.h"
89+
#include "../../util/hist/fd_histf.h"
8990

9091
/* FD_QUIC_API marks public API declarations. No-op for now. */
9192
#define FD_QUIC_API

src/waltz/quic/fd_quic_private.h

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "fd_quic_stream_pool.h"
1212
#include "fd_quic_pretty_print.h"
1313
#include "fd_quic_svc_q.h"
14+
#include <math.h>
1415

1516
#include "../../util/log/fd_dtrace.h"
1617
#include "../../util/net/fd_ip4.h"

0 commit comments

Comments
 (0)