Update page size to 64k

JuliaLang · Jul 19, 2023 · 01a0f4a · 01a0f4a
1 parent 0f56da8
commit 01a0f4a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/gc.h b/src/gc.h
@@ -32,8 +32,8 @@
 extern "C" {
 #endif
 
-#define GC_PAGE_LG2 14 // log2(size of a page)
-#define GC_PAGE_SZ (1 << GC_PAGE_LG2) // 16k
+#define GC_PAGE_LG2 16 // log2(size of a page)
+#define GC_PAGE_SZ (1 << GC_PAGE_LG2) // 64k
 #define GC_PAGE_OFFSET (JL_HEAP_ALIGNMENT - (sizeof(jl_taggedvalue_t) % JL_HEAP_ALIGNMENT))
 
 #define jl_malloc_tag ((void*)0xdeadaa01)
@@ -233,14 +233,14 @@ STATIC_INLINE jl_gc_pagemeta_t *pop_lf_page_metadata_back(jl_gc_global_page_pool
 #define REGION0_PG_COUNT (1 << 16)
 #define REGION1_PG_COUNT (1 << 16)
 #define REGION2_PG_COUNT (1 << 18)
-#define REGION0_INDEX(p) (((uintptr_t)(p) >> 14) & 0xFFFF) // shift by GC_PAGE_LG2
+#define REGION0_INDEX(p) (((uintptr_t)(p) >> GC_PAGE_LG2) & 0xFFFF) // shift by GC_PAGE_LG2
 #define REGION1_INDEX(p) (((uintptr_t)(p) >> 30) & 0xFFFF)
 #define REGION_INDEX(p)  (((uintptr_t)(p) >> 46) & 0x3FFFF)
 #else
 #define REGION0_PG_COUNT (1 << 8)
 #define REGION1_PG_COUNT (1 << 10)
 #define REGION2_PG_COUNT (1 << 0)
-#define REGION0_INDEX(p) (((uintptr_t)(p) >> 14) & 0xFF) // shift by GC_PAGE_LG2
+#define REGION0_INDEX(p) (((uintptr_t)(p) >> GC_PAGE_LG2) & 0xFF) // shift by GC_PAGE_LG2
 #define REGION1_INDEX(p) (((uintptr_t)(p) >> 22) & 0x3FF)
 #define REGION_INDEX(p)  (0)
 #endif

diff --git a/src/julia_internal.h b/src/julia_internal.h
@@ -345,7 +345,8 @@ void *jl_gc_perm_alloc(size_t sz, int zero,
 void gc_sweep_sysimg(void);
 
 
-// pools are 16376 bytes large (GC_POOL_SZ - GC_PAGE_OFFSET)
+// pools are 65528 bytes large (GC_POOL_SZ - GC_PAGE_OFFSET)
+// TODO update table for 64k size
 static const int jl_gc_sizeclasses[] = {
 #ifdef _P64
     8,