From cce4acea89d6ae08dfc79e9c93b66b2a09834abd Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Fri, 14 Jun 2024 11:12:16 +0200 Subject: treewide: utilize _Alignas, as it's standard C11 --- lib/generic/lru.h | 11 ++++------- lib/kru.h | 8 +------- lib/kru.inc.c | 5 +++-- 3 files changed, 8 insertions(+), 16 deletions(-) (limited to 'lib') diff --git a/lib/generic/lru.h b/lib/generic/lru.h index 1c1dd81a..b78888fc 100644 --- a/lib/generic/lru.h +++ b/lib/generic/lru.h @@ -172,11 +172,7 @@ enum lru_apply_do { enum lru_apply_do (*(name))(const char *key, uint len, val_type *val, void *baton) typedef lru_apply_fun_g(lru_apply_fun, void); -#if __GNUC__ >= 4 - #define CACHE_ALIGNED __attribute__((aligned(64))) -#else - #define CACHE_ALIGNED -#endif +#define CACHE_ALIGNED _Alignas(64) struct lru; void lru_free_items_impl(struct lru *lru); @@ -198,10 +194,11 @@ struct lru_item; #define LRU_TRACKED ((64 - sizeof(size_t) * LRU_ASSOC) / 4 - 1) struct lru_group { + CACHE_ALIGNED uint16_t counts[LRU_TRACKED+1]; /*!< Occurrence counters; the last one is special. */ uint16_t hashes[LRU_TRACKED+1]; /*!< Top halves of hashes; the last one is unused. */ struct lru_item *items[LRU_ASSOC]; /*!< The full items. */ -} CACHE_ALIGNED; +}; /* The sizes are chosen so lru_group just fits into a single x86 cache line. */ static_assert(64 == sizeof(struct lru_group) @@ -213,7 +210,7 @@ struct lru { *mm_array; /**< Memory context to use for this structure itself. */ uint log_groups; /**< Logarithm of the number of LRU groups. */ uint val_alignment; /**< Alignment for the values. */ - struct lru_group groups[] CACHE_ALIGNED; /**< The groups of items. */ + CACHE_ALIGNED struct lru_group groups[]; /**< The groups of items. */ }; /** @internal See lru_free. */ diff --git a/lib/kru.h b/lib/kru.h index a443e419..0a3a8e80 100644 --- a/lib/kru.h +++ b/lib/kru.h @@ -20,13 +20,7 @@ #include #include -#if __GNUC__ >= 4 || __clang_major__ >= 4 - #define ALIGNED_CPU_CACHE __attribute__((aligned(64))) - #define ALIGNED(_bytes) __attribute__((aligned(_bytes))) -#else - #define ALIGNED_CPU_CACHE - #define ALIGNED(_bytes) -#endif +#define ALIGNED_CPU_CACHE _Alignas(64) // An unsigned integral type used for prices, blocking occurs when sum of prices overflows. // Greater than 16-bit type enables randomized fractional incrementing as the internal counters are still 16-bit. diff --git a/lib/kru.inc.c b/lib/kru.inc.c index 9909cfd7..b67d3237 100644 --- a/lib/kru.inc.c +++ b/lib/kru.inc.c @@ -74,11 +74,12 @@ typedef uint64_t hash_t; /// Block of loads sharing the same time, so that we're more space-efficient. /// It's exactly a single cache line. struct load_cl { + ALIGNED_CPU_CACHE _Atomic uint32_t time; #define LOADS_LEN 15 uint16_t ids[LOADS_LEN]; uint16_t loads[LOADS_LEN]; -} ALIGNED_CPU_CACHE; +}; static_assert(64 == sizeof(struct load_cl), "bad size of struct load_cl"); /// Parametrization for speed of decay. @@ -96,7 +97,7 @@ struct kru { #if USE_AES /// Hashing secret. Random but shared by all users of the table. /// Let's not make it too large, so that header fits into 64 Bytes. - char hash_key[48] ALIGNED(32); + _Alignas(32) char hash_key[48]; #else /// Hashing secret. Random but shared by all users of the table. SIPHASH_KEY hash_key; -- cgit v1.2.3