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 Silicon JIT compilation Date: Thu, 17 Nov 2022 17:36:15 -0800 Message-ID: <20221118013615.81209-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="29189"; 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 Fri Nov 18 02:36:52 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 1ovqJI-0007PS-Sp for guile-devel@m.gmane-mx.org; Fri, 18 Nov 2022 02:36:52 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ovqIv-0006tp-H4; Thu, 17 Nov 2022 20:36:29 -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 1ovqIt-0006tT-PV for guile-devel@gnu.org; Thu, 17 Nov 2022 20:36:27 -0500 Original-Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ovqIp-00045H-I9 for guile-devel@gnu.org; Thu, 17 Nov 2022 20:36:27 -0500 Original-Received: by mail-pj1-x1031.google.com with SMTP id u8-20020a17090a5e4800b002106dcdd4a0so7028921pji.1 for ; Thu, 17 Nov 2022 17:36:22 -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=X1W1PbEuqTb0Rm81h7QBzdNwn8dGs+XzTu6uy7Baak0=; b=m6Dh0mqo4tgGbrjE2FwUDXTDswu7VXiBpyC63ewPeCY3ejhGMRNrKZiKb4357c5PW/ 3DsEGRB9/1v5asmTGIBe0dQYSzqVa/uNbnm15j2bxhtlK1sED3RmuKnsgBIfg9s6vGRT Bb5NXf90Q3SFqMoB+EjHE9UJK2yIjrjM53j10ZyGEUT2p5RHYOsHjU2ZnvB8uj+D1Buz xJ1quodkmZzXOS+xecXn+H+F2DFbNh2c7S6yyybhlrqbhq8gAM6QvoONW+NOAgbyiPTd 6lVm5Gt2RWZZa6GebWTl+ax/L6/8Ik0MSjoFaSnkOXmv/KiHNWe0h64NJSXA1Vq5kHvP +A7w== 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=X1W1PbEuqTb0Rm81h7QBzdNwn8dGs+XzTu6uy7Baak0=; b=xu9BzQEuYiGxxkUvwxFGvxKRXFrPhjMkrbuTykeBpWEBJuifxyq4sSOuR/UvBECJG+ cYv9thBuG6XCrHMV9DB/qLRw1cUieQ62Wxh9RcIP7Qv2OsrZgwIaviOJWsKHq62mmFaq LD8wCTHrMJxgcBt064IGJjTG2GKx3aS7LjK6svo/oJtpSwnaRZNuRs4l97HbR+DgOYPZ Uh+bAGlQvRmB9jmAqNfp6BB9/KUJm/S6ygICBBZBzE4m5tug3nN01//k6Zw7mCiPRw/W N+5Q0cuDrYJ9RH9v0oSj2Fmq4dY7lEanU61LpXJsT5HYe5wf+VWe2pM7ThTl/CHkkCet qVjA== X-Gm-Message-State: ANoB5pm4ERGPqcwAiPEVia0it6oJ9KXxuRoSw3QuYz6PzTjjoJkGA0/E do966KSQwpZ+d6YM0E1s2OVV2JBQfrlk9Q== X-Google-Smtp-Source: AA0mqf46sBRrp65BrJnUXHf1CI1dfc325eDy2njIaVchZpNBKea440xJXqeJhdhhcVc6ivYPwkJjqw== X-Received: by 2002:a17:902:820f:b0:17f:7f7e:70c7 with SMTP id x15-20020a170902820f00b0017f7f7e70c7mr5333740pln.107.1668735381159; Thu, 17 Nov 2022 17:36:21 -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 on16-20020a17090b1d1000b0020b21019086sm10480713pjb.3.2022.11.17.17.36.20 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 17 Nov 2022 17:36:20 -0800 (PST) X-Mailer: git-send-email 2.37.1 (Apple Git-137.1) Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=aconchillo@gmail.com; helo=mail-pj1-x1031.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:21478 Archived-At: * configure.ac: check for pthread_jit_write_protect_np. * libguile/jit.c: add support for Apple Silicon 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..f8c12f0d7 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 Silicon 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..5cef8fae3 100644 --- a/libguile/jit.c +++ b/libguile/jit.c @@ -47,6 +47,10 @@ #include #endif +#if defined __APPLE__ && HAVE_PTHREAD_JIT_WRITE_PROTECT_NP +#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)