From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?UTF-8?q?Aleix=20Conchillo=20Flaqu=C3=A9?= Newsgroups: gmane.lisp.guile.devel Subject: [PATCH] fix Apple's M1 JIT compilation Date: Tue, 15 Nov 2022 16:01:30 -0800 Message-ID: <20221116000130.38127-1-aconchillo@gmail.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="32390"; mail-complaints-to="usenet@ciao.gmane.io" Cc: =?UTF-8?q?Aleix=20Conchillo=20Flaqu=C3=A9?= To: guile-devel@gnu.org Original-X-From: guile-devel-bounces+guile-devel=m.gmane-mx.org@gnu.org Wed Nov 16 01:02:33 2022 Return-path: Envelope-to: guile-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ov5su-00089n-MK for guile-devel@m.gmane-mx.org; Wed, 16 Nov 2022 01:02:32 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ov5se-0002WM-B4; Tue, 15 Nov 2022 19:02:16 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ov5s9-0002TX-MN for guile-devel@gnu.org; Tue, 15 Nov 2022 19:01:48 -0500 Original-Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ov5s6-0006fs-9e for guile-devel@gnu.org; Tue, 15 Nov 2022 19:01:45 -0500 Original-Received: by mail-pj1-x1029.google.com with SMTP id d13-20020a17090a3b0d00b00213519dfe4aso747252pjc.2 for ; Tue, 15 Nov 2022 16:01:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=DKwzuSD7YTuBseZuGJV2m9YRFPqJlyDnXr+DABpUI6M=; b=f0b1gEecPz/p6kV8Ymx0+9JBQxuNtywk6dOECD5Nzag2LeQ7M3wI7a2wNCIdJFZKug ZN3/KO6eCfLX/s8mY+VSPGGJJLzcXx/2nvcNTdGjYlPjkxuWMusZEvtP2VJNKI1K4JIe fJbh2JTDKNKJ7AcxjWJtPQs7AmfgHULv+ePx4xau10KyIeLrkpjzaQ2uHzMtmQ194nZc TzVMqhepOSVsnKPfo81l/khsPQqvMDNXFwL7Mjnv2EeF8bf+DQF2Tn4cIB8ClbGn8FkQ X6tQb5UZuQtitN1BD/7drEuDyUTIFBkHpBLDeyt/6ZywAx//RJJGYWZyaWsIntmLjHzA h67Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=DKwzuSD7YTuBseZuGJV2m9YRFPqJlyDnXr+DABpUI6M=; b=c/+70gpItcW7S5dZvP7oevTgjs4nv/BvrSCCFVt6p9LprUCX03hcKIUBZSd6jFCK+L CbrNYdrS0L3k4tAHl5ADYZn/GjaMwGMi1PM83h8fjtYQ5V/8WzOT4HnKjI8QOdxZ7qoY OP0FIlQ+23o+4zcFOjN1Tk7WmoDrBvGgGE/YGDPLThhwRNsHtMnEumxwnooD4Zhohi6+ PizD1SscyyAmH9Pkxp//23d3bzfe12xJw/52BeDVEmPrY5kMJQkvE8ZMJFskUr+nbHDR rsYr6Vq09GTNbg1pJmByDb+A7q30KLgXFSVv0a2W/n9rOxoBhqQ4pyuNMaR4YuoD7/UV PMmQ== X-Gm-Message-State: ANoB5pkW8KrJ2FNXni9IC+VwNGDE4+gzR1JX8ETFBDzTZnDmOk84iUB4 fcMfrnzavadFMrnVAPkenLeIxZYW+ySA/A== X-Google-Smtp-Source: AA0mqf4xiAdMlFvndgyQNIKUgKqdjj1tVJ8GjLbJ20avrspBhBy5EpNJAPkPVfMJo5xJXH/0mdVwfQ== X-Received: by 2002:a17:902:b183:b0:186:d5b9:fbcd with SMTP id s3-20020a170902b18300b00186d5b9fbcdmr6529217plr.64.1668556900012; Tue, 15 Nov 2022 16:01:40 -0800 (PST) Original-Received: from localhost (cpe-198-72-134-0.socal.res.rr.com. [198.72.134.0]) by smtp.gmail.com with UTF8SMTPSA id l5-20020a170903120500b0018863dbf3b0sm10655301plh.45.2022.11.15.16.01.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 15 Nov 2022 16:01:39 -0800 (PST) X-Mailer: git-send-email 2.37.1 (Apple Git-137.1) Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=aconchillo@gmail.com; helo=mail-pj1-x1029.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-devel-bounces+guile-devel=m.gmane-mx.org@gnu.org Original-Sender: guile-devel-bounces+guile-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.lisp.guile.devel:21473 Archived-At: * configure.ac: check for pthread_jit_write_protect_np. * libguile/jit.c: add support for Apple's M1 JIT compilation. Fixes https://debbugs.gnu.org/cgi/bugreport.cgi?bug=44505 --- configure.ac | 3 +++ libguile/jit.c | 25 ++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b3879df1f..200e4682d 100644 --- a/configure.ac +++ b/configure.ac @@ -1187,6 +1187,9 @@ case "$with_threads" in pthread_get_stackaddr_np pthread_attr_get_np pthread_sigmask \ pthread_cancel]) + # Apple's M1 JIT code arena needs to be unprotected before writing. + AC_CHECK_FUNCS([pthread_jit_write_protect_np]) + # On past versions of Solaris, believe 8 through 10 at least, you # had to write "pthread_once_t foo = { PTHREAD_ONCE_INIT };". # This is contrary to POSIX: diff --git a/libguile/jit.c b/libguile/jit.c index 8420829b4..b17460401 100644 --- a/libguile/jit.c +++ b/libguile/jit.c @@ -47,6 +47,10 @@ #include #endif +#if defined __APPLE__ +#include +#endif + #include "jit.h" @@ -1349,9 +1353,13 @@ allocate_code_arena (size_t size, struct code_arena *prev) ret->size = size; ret->prev = prev; #ifndef __MINGW32__ + int flags = MAP_PRIVATE | MAP_ANONYMOUS; +#if defined __APPLE__ && HAVE_PTHREAD_JIT_WRITE_PROTECT_NP + flags |= MAP_JIT; +#endif ret->base = mmap (NULL, ret->size, PROT_EXEC | PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + flags, -1, 0); if (ret->base == MAP_FAILED) { perror ("allocating JIT code buffer failed"); @@ -1406,11 +1414,21 @@ emit_code (scm_jit_state *j, void (*emit) (scm_jit_state *)) uint8_t *ret = jit_address (j->jit); +#if defined __APPLE__ && HAVE_PTHREAD_JIT_WRITE_PROTECT_NP + pthread_jit_write_protect_np(0); +#endif + emit (j); size_t size; if (!jit_has_overflow (j->jit) && jit_end (j->jit, &size)) { +#if defined __APPLE__ && HAVE_PTHREAD_JIT_WRITE_PROTECT_NP + /* protect previous code arena. leave unprotected after emit() + since jit_end() also writes to code arena. */ + pthread_jit_write_protect_np(1); + sys_icache_invalidate(arena->base, arena->size); +#endif ASSERT (size <= (arena->size - arena->used)); DEBUG ("mcode: %p,+%zu\n", ret, size); arena->used += size; @@ -1424,6 +1442,11 @@ emit_code (scm_jit_state *j, void (*emit) (scm_jit_state *)) } else { +#if defined __APPLE__ && HAVE_PTHREAD_JIT_WRITE_PROTECT_NP + /* protect previous code arena */ + pthread_jit_write_protect_np(1); + sys_icache_invalidate(arena->base, arena->size); +#endif jit_reset (j->jit); if (arena->used == 0) { -- 2.37.1 (Apple Git-137.1)