Merge pull request #29046 from charris/backport-29041

charris · web-flow · commit 78f0dbd49b6b · 2025-05-23T11:13:26.000-06:00
BUG: Fix cache use regression
diff --git a/numpy/_core/src/multiarray/alloc.c b/numpy/_core/src/multiarray/alloc.c
@@ -27,9 +27,21 @@
 #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
+
+# 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 */
@@ -38,7 +50,6 @@ typedef struct {
 static cache_bucket datacache[NBUCKETS];
 static cache_bucket dimcache[NBUCKETS_DIM];
 
-
 /*
  * This function tells whether NumPy attempts to call `madvise` with
  * `MADV_HUGEPAGE`.  `madvise` is only ever used on linux, so the value
@@ -99,20 +110,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 */
 
 /*
