Skip to content

BUG: Fix cache use regression #29046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 23, 2025
+15 −18
Merged

BUG: Fix cache use regression #29046

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e659814
BUG: Fix cache use regression
seberg May 23, 2025
975458f
ok, don't attempt to remove the statics (too ingrained)
seberg May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
BUG: Fix cache use regression 
gh-29006 got the branching wrong leaving the cache undefined on most
GCC/clang, which means we wouldn't use it.

Also move it up so that we can just remove the unused globals entirely.
  • Loading branch information
@seberg @charris
seberg authored and charris committed May 23, 2025
commit e6598146f92c27b51ee30f72782aece0787defb0
35 changes: 17 additions & 18 deletions numpy/_core/src/multiarray/alloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,30 @@
#endif
#endif

#define NBUCKETS 1024 /* number of buckets for data*/
#define NBUCKETS_DIM 16 /* number of buckets for dimensions/strides */
#define NCACHE 7 /* number of cache entries per bucket */
/* Do not enable the alloc cache if the GIL is disabled, or if ASAN or MSAN
* instrumentation is enabled. The cache makes ASAN use-after-free or MSAN
* use-of-uninitialized-memory warnings less useful. */
#define USE_ALLOC_CACHE 1
#ifdef Py_GIL_DISABLED
# define USE_ALLOC_CACHE 0
#elif defined(__has_feature)
# if __has_feature(address_sanitizer) || __has_feature(memory_sanitizer)
# define USE_ALLOC_CACHE 0
# endif
#endif

#if USE_ALLOC_CACHE
# define NBUCKETS 1024 /* number of buckets for data*/
# define NBUCKETS_DIM 16 /* number of buckets for dimensions/strides */
# define NCACHE 7 /* number of cache entries per bucket */
/* this structure fits neatly into a cacheline */
typedef struct {
npy_uintp available; /* number of cached pointers */
void * ptrs[NCACHE];
} cache_bucket;
static cache_bucket datacache[NBUCKETS];
static cache_bucket dimcache[NBUCKETS_DIM];

#endif /* USE_ALLOC_CACHE */

/*
* This function tells whether NumPy attempts to call `madvise` with
Expand Down Expand Up @@ -99,20 +112,6 @@ indicate_hugepages(void *p, size_t size) {
}


/* Do not enable the alloc cache if the GIL is disabled, or if ASAN or MSAN
* instrumentation is enabled. The cache makes ASAN use-after-free or MSAN
* use-of-uninitialized-memory warnings less useful. */
#ifdef Py_GIL_DISABLED
#define USE_ALLOC_CACHE 0
#elif defined(__has_feature)
# if __has_feature(address_sanitizer) || __has_feature(memory_sanitizer)
# define USE_ALLOC_CACHE 0
# endif
#else
#define USE_ALLOC_CACHE 1
#endif


/* as the cache is managed in global variables verify the GIL is held */

/*
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy