JIT for PHP based on DynAsm

TSRM/TSRM.c

@@ -747,6 +747,26 @@ TSRM_API void *tsrm_get_ls_cache(void)
 	return tsrm_tls_get();
 }/*}}}*/
 
+/* Returns offset of tsrm_ls_cache slot from Thread Control Block address */
+TSRM_API size_t tsrm_get_ls_cache_tcb_offset(void)
+{/*{{{*/
+#if defined(__x86_64__) && defined(__GNUC__)
+	size_t ret;
+
+	asm ("movq _tsrm_ls_cache@gottpoff(%%rip),%0"
+          : "=r" (ret));
+	return ret;
+#elif defined(__i386__) && defined(__GNUC__)
+	size_t ret;
+
+	asm ("leal _tsrm_ls_cache@ntpoff,%0"
+          : "=r" (ret));
+	return ret;
+#else
+	return 0;
+#endif
+}/*}}}*/
+
 TSRM_API uint8_t tsrm_is_main_thread(void)
 {/*{{{*/
 	return in_main_thread;

TSRM/TSRM.h

@@ -133,6 +133,7 @@ TSRM_API void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread
 TSRM_API void *tsrm_set_shutdown_handler(tsrm_shutdown_func_t shutdown_handler);
 
 TSRM_API void *tsrm_get_ls_cache(void);
+TSRM_API size_t tsrm_get_ls_cache_tcb_offset(void);
 TSRM_API uint8_t tsrm_is_main_thread(void);
 TSRM_API const char *tsrm_api_name(void);
 

Zend/zend_gdb.c

@@ -0,0 +1,140 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) Zend Technologies Ltd. (http://www.zend.com)           |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | [email protected] so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Dmitry Stogov <[email protected]>                             |
+   |          Xinchen Hui <[email protected]>                            |
+   +----------------------------------------------------------------------+
+*/
+
+#include "zend.h"
+#include "zend_gdb.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+enum {
+	ZEND_GDBJIT_NOACTION,
+	ZEND_GDBJIT_REGISTER,
+	ZEND_GDBJIT_UNREGISTER
+};
+
+typedef struct _zend_gdbjit_code_entry {
+	struct _zend_gdbjit_code_entry *next_entry;
+	struct _zend_gdbjit_code_entry *prev_entry;
+	const char                     *symfile_addr;
+	uint64_t                        symfile_size;
+} zend_gdbjit_code_entry;
+
+typedef struct _zend_gdbjit_descriptor {
+	uint32_t                         version;
+	uint32_t                         action_flag;
+	struct _zend_gdbjit_code_entry *relevant_entry;
+	struct _zend_gdbjit_code_entry *first_entry;
+} zend_gdbjit_descriptor;
+
+ZEND_API zend_gdbjit_descriptor __jit_debug_descriptor = {
+	1, ZEND_GDBJIT_NOACTION, NULL, NULL
+};
+
+ZEND_API zend_never_inline void __jit_debug_register_code()
+{
+	__asm__ __volatile__("");
+}
+
+ZEND_API int zend_gdb_register_code(const void *object, size_t size)
+{
+	zend_gdbjit_code_entry *entry;
+
+	entry = malloc(sizeof(zend_gdbjit_code_entry) + size);
+	if (entry == NULL) {
+		return 0;
+	}
+
+	entry->symfile_addr = ((char*)entry) + sizeof(zend_gdbjit_code_entry);
+	entry->symfile_size = size;
+
+	memcpy((char *)entry->symfile_addr, object, size);
+
+	entry->prev_entry = NULL;
+	entry->next_entry = __jit_debug_descriptor.first_entry;
+
+	if (entry->next_entry) {
+		entry->next_entry->prev_entry = entry;
+	}
+	__jit_debug_descriptor.first_entry = entry;
+
+	/* Notify GDB */
+	__jit_debug_descriptor.relevant_entry = entry;
+	__jit_debug_descriptor.action_flag = ZEND_GDBJIT_REGISTER;
+	__jit_debug_register_code();
+
+	return 1;
+}
+
+ZEND_API void zend_gdb_unregister_all(void)
+{
+	zend_gdbjit_code_entry *entry;
+
+	__jit_debug_descriptor.action_flag = ZEND_GDBJIT_UNREGISTER;
+	while ((entry = __jit_debug_descriptor.first_entry)) {
+		__jit_debug_descriptor.first_entry = entry->next_entry;
+		if (entry->next_entry) {
+			entry->next_entry->prev_entry = NULL;
+		}
+		/* Notify GDB */
+		__jit_debug_descriptor.relevant_entry = entry;
+		__jit_debug_register_code();
+
+		free(entry);
+	}
+}
+
+ZEND_API int zend_gdb_present(void)
+{
+	int ret = 0;
+	int fd = open("/proc/self/status", O_RDONLY);
+
+	if (fd > 0) {
+		char buf[1024];
+		ssize_t n = read(fd, buf, sizeof(buf) - 1);
+		char *s;
+		pid_t pid;
+
+		if (n > 0) {
+			buf[n] = 0;
+			s = strstr(buf, "TracerPid:");
+			if (s) {
+				s += sizeof("TracerPid:") - 1;
+				while (*s == ' ' || *s == '\t') {
+					s++;
+				}
+				pid = atoi(s);
+				if (pid) {
+					sprintf(buf, "/proc/%d/exe", (int)pid);
+					if (readlink(buf, buf, sizeof(buf) - 1) > 0) {
+						if (strstr(buf, "gdb")) {
+							ret = 1;
+						}
+					}
+				}
+			}
+		}
+
+		close(fd);
+	}
+
+	return ret;
+}

Zend/zend_gdb.h

@@ -0,0 +1,27 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) Zend Technologies Ltd. (http://www.zend.com)           |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | [email protected] so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Dmitry Stogov <[email protected]>                             |
+   |          Xinchen Hui <[email protected]>                            |
+   +----------------------------------------------------------------------+
+*/
+
+#ifndef ZEND_GDB
+#define ZEND_GDB
+
+ZEND_API int  zend_gdb_register_code(const void *object, size_t size);
+ZEND_API void zend_gdb_unregister_all(void);
+ZEND_API int  zend_gdb_present(void);
+
+#endif

configure.ac

@@ -1563,7 +1563,7 @@ PHP_ADD_SOURCES(Zend, \
     zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_gc.c \
     zend_closures.c zend_weakrefs.c zend_float.c zend_string.c zend_signal.c zend_generators.c \
     zend_virtual_cwd.c zend_ast.c zend_objects.c zend_object_handlers.c zend_objects_API.c \
-    zend_default_classes.c zend_inheritance.c zend_smart_str.c zend_cpuinfo.c, \
+    zend_default_classes.c zend_inheritance.c zend_smart_str.c zend_cpuinfo.c zend_gdb.c, \
 	-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
 
 dnl Selectively disable optimization due to high RAM usage during

ext/opcache/ZendAccelerator.c

@@ -46,6 +46,10 @@
 #include "ext/pcre/php_pcre.h"
 #include "ext/standard/md5.h"
 
+#ifdef HAVE_JIT
+# include "jit/zend_jit.h"
+#endif
+
 #ifndef ZEND_WIN32
 #include  <netdb.h>
 #endif
@@ -2394,13 +2398,25 @@ int accel_activate(INIT_FUNC_ARGS)
 		accel_reset_pcre_cache();
 	}
 
+
+#ifdef HAVE_JIT
+	zend_jit_activate();
+#endif
+
 	if (ZCSG(preload_script)) {
 		preload_activate();
 	}
 
 	return SUCCESS;
 }
 
+#ifdef HAVE_JIT
+void accel_deactivate(void)
+{
+	zend_jit_deactivate();
+}
+#endif
+
 int accel_post_deactivate(void)
 {
 	if (ZCG(cwd)) {
@@ -2813,12 +2829,46 @@ static int accel_post_startup(void)
 		}
 	}
 
+	/* Initialize zend_func_info_rid */
+	zend_optimizer_startup();
+
 /********************************************/
 /* End of non-SHM dependent initializations */
 /********************************************/
 	file_cache_only = ZCG(accel_directives).file_cache_only;
 	if (!file_cache_only) {
-		switch (zend_shared_alloc_startup(ZCG(accel_directives).memory_consumption)) {
+		size_t shm_size = ZCG(accel_directives).memory_consumption;
+#ifdef HAVE_JIT
+		size_t jit_size = 0;
+		zend_bool reattached = 0;
+
+		if (ZCG(accel_directives).jit &&
+		    ZCG(accel_directives).jit_buffer_size) {
+			size_t page_size;
+
+# ifdef _WIN32
+			SYSTEM_INFO system_info;
+			GetSystemInfo(&system_info);
+			page_size = system_info.dwPageSize;
+# else
+			page_size = getpagesize();
+# endif
+			if (!page_size || (page_size & (page_size - 1))) {
+				zend_accel_error(ACCEL_LOG_FATAL, "Failure to initialize shared memory structures - can't get page size.");
+				abort();
+			}
+			jit_size = ZCG(accel_directives).jit_buffer_size;
+			jit_size = ZEND_MM_ALIGNED_SIZE_EX(jit_size, page_size);
+			shm_size += jit_size;
+		} else {
+			ZCG(accel_directives).jit = 0;
+			ZCG(accel_directives).jit_buffer_size = 0;
+		}
+
+		switch (zend_shared_alloc_startup(shm_size, jit_size)) {
+#else
+		switch (zend_shared_alloc_startup(shm_size, 0)) {
+#endif
 			case ALLOC_SUCCESS:
 				if (zend_accel_init_shm() == FAILURE) {
 					accel_startup_ok = 0;
@@ -2830,6 +2880,9 @@ static int accel_post_startup(void)
 				zend_accel_error(ACCEL_LOG_FATAL, "Failure to initialize shared memory structures - probably not enough shared memory.");
 				return SUCCESS;
 			case SUCCESSFULLY_REATTACHED:
+#ifdef HAVE_JIT
+				reattached = 1;
+#endif
 				zend_shared_alloc_lock();
 				accel_shared_globals = (zend_accel_shared_globals *) ZSMMG(app_shared_globals);
 				zend_interned_strings_set_request_storage_handlers(accel_new_interned_string_for_php, accel_init_interned_string_for_php);
@@ -2861,6 +2914,16 @@ static int accel_post_startup(void)
 		zend_accel_init_auto_globals();
 
 		zend_shared_alloc_lock();
+#ifdef HAVE_JIT
+		if (ZCG(accel_directives).jit &&
+		    ZCG(accel_directives).jit_buffer_size &&
+		    ZSMMG(reserved)) {
+			zend_jit_startup(ZCG(accel_directives).jit, ZSMMG(reserved), jit_size, reattached);
+		} else {
+			ZCG(accel_directives).jit = 0;
+			ZCG(accel_directives).jit_buffer_size = 0;
+		}
+#endif
 		zend_shared_alloc_save_state();
 		zend_shared_alloc_unlock();
 
@@ -2944,6 +3007,10 @@ void accel_shutdown(void)
 	zend_ini_entry *ini_entry;
 	zend_bool _file_cache_only = 0;
 
+#ifdef HAVE_JIT
+	zend_jit_shutdown();
+#endif
+
 	zend_optimizer_shutdown();
 
 	zend_accel_blacklist_shutdown(&accel_blacklist);
@@ -4244,7 +4311,11 @@ ZEND_EXT_API zend_extension zend_extension_entry = {
 	accel_startup,					   		/* startup */
 	NULL,									/* shutdown */
 	NULL,									/* per-script activation */
+#ifdef HAVE_JIT
+    accel_deactivate,                       /* per-script deactivation */
+#else
 	NULL,									/* per-script deactivation */
+#endif
 	NULL,									/* message handler */
 	NULL,									/* op_array handler */
 	NULL,									/* extended statement handler */

ext/opcache/ZendAccelerator.h

@@ -185,6 +185,11 @@ typedef struct _zend_accel_directives {
 	zend_bool      huge_code_pages;
 #endif
 	char *preload;
+#ifdef HAVE_JIT
+	zend_long      jit;
+	zend_long      jit_buffer_size;
+	zend_long      jit_debug;
+#endif
 } zend_accel_directives;
 
 typedef struct _zend_accel_globals {