Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-30 21:21:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

GH-126195: Use M1 JIT memory protection APIs (GH-126196)

Browse source
This commit is contained in:
Diego Russo 2024-11-12 01:20:10 +00:00 • committed by GitHub
parent 494360afd0
commit c45be8aa71
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/NEWS.d/next/Core_and_Builtins/2024-10-30-18-16-10.gh-issue-126195.6ezBpr.rst Normal file
View file

@ -0,0 +1 @@
Improve JIT performance by 1.4% on macOS Apple Silicon by using platform-specific memory protection APIs. Patch by Diego Russo.

18
Python/jit.c
View file

@ -58,7 +58,12 @@ jit_alloc(size_t size)
int failed = memory == NULL; int failed = memory == NULL;
#else #else
int flags = MAP_ANONYMOUS | MAP_PRIVATE; int flags = MAP_ANONYMOUS | MAP_PRIVATE;
unsigned char *memory = mmap(NULL, size, PROT_READ | PROT_WRITE, flags, -1, 0); int prot = PROT_READ | PROT_WRITE;
# ifdef MAP_JIT
flags |= MAP_JIT;
prot |= PROT_EXEC;
# endif
unsigned char *memory = mmap(NULL, size, prot, flags, -1, 0);
int failed = memory == MAP_FAILED; int failed = memory == MAP_FAILED;
#endif #endif
if (failed) { if (failed) {
@ -102,8 +107,11 @@ mark_executable(unsigned char *memory, size_t size)
int old; int old;
int failed = !VirtualProtect(memory, size, PAGE_EXECUTE_READ, &old); int failed = !VirtualProtect(memory, size, PAGE_EXECUTE_READ, &old);
#else #else
int failed = 0;
__builtin___clear_cache((char *)memory, (char *)memory + size); __builtin___clear_cache((char *)memory, (char *)memory + size);
int failed = mprotect(memory, size, PROT_EXEC | PROT_READ); #ifndef MAP_JIT
failed = mprotect(memory, size, PROT_EXEC | PROT_READ);
#endif
#endif #endif
if (failed) { if (failed) {
jit_error("unable to protect executable memory"); jit_error("unable to protect executable memory");
@ -499,6 +507,9 @@ _PyJIT_Compile(_PyExecutorObject *executor, const _PyUOpInstruction trace[], siz
if (memory == NULL) { if (memory == NULL) {
return -1; return -1;
} }
#ifdef MAP_JIT
pthread_jit_write_protect_np(0);
#endif
// Update the offsets of each instruction: // Update the offsets of each instruction:
for (size_t i = 0; i < length; i++) { for (size_t i = 0; i < length; i++) {
state.instruction_starts[i] += (uintptr_t)memory; state.instruction_starts[i] += (uintptr_t)memory;
@ -529,6 +540,9 @@ _PyJIT_Compile(_PyExecutorObject *executor, const _PyUOpInstruction trace[], siz
data += group->data_size; data += group->data_size;
assert(code == memory + code_size); assert(code == memory + code_size);
assert(data == memory + code_size + data_size); assert(data == memory + code_size + data_size);
#ifdef MAP_JIT
pthread_jit_write_protect_np(1);
#endif
if (mark_executable(memory, total_size)) { if (mark_executable(memory, total_size)) {
jit_free(memory, total_size); jit_free(memory, total_size);
return -1; return -1;