bdnugget/php-src
1
0 Fork 0
mirror of https://github.com/bdnugget/php-src.git synced 2026-11-07 09:17:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hybrid use of registers

Browse Source 
1. one **hybrid** solution of register usage
After the discussion with Dmitry, we may want to propose one hybrid
solution of register usage.

1) Following the x86 implementation, we define REG0/1/2 to be the
scratch registers. Clever tricks are utilized in x86 implementation for
better register allocation. Note that we define REG0/1/2 as x8/9/10. One
reason is that R0 and FCARG1 should be distinguished.

2) Temporary registers are also reserved(i.e. they are excluded from the
candidates of register allocator), and they would be used due to the
different addressing modes in AArch64.

2. update the 'make clean' target.

3. remove the unnecessary AArch64 related macros in zend_jit_internal.h.

[ci skip]

Change-Id: I627157b88b2344530d705751eb7f73a223ed83e5
CustomizedGitHooks: yes
This commit is contained in:
haosun01 authored and Dmitry Stogov committed 2021-05-18 15:32:23 +03:00
1 parent 0de9494464
commit 657b00d7c0
6 files changed
+484 -265
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

build/Makefile.global
+1 -2
View File
@@ -117,6 +117,7 @@ clean:
find . -name .libs -a -type d|xargs rm -rf
rm -f libphp.la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
rm -f ext/opcache/jit/zend_jit_x86.c
rm -f ext/opcache/jit/zend_jit_arm64.c
distclean: clean
rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h
@@ -125,8 +126,6 @@ distclean: clean
rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 sapi/phpdbg/phpdbg.1 ext/phar/phar.1 ext/phar/phar.phar.1
rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
rm -f ext/phar/phar.phar ext/phar/phar.php
rm -f ext/opcache/jit/zend_jit_x86.c
rm -f ext/opcache/jit/zend_jit_arm64.c
if test "$(srcdir)" != "$(builddir)"; then \
rm -f ext/phar/phar/phar.inc; \
fi
ext/opcache/jit/zend_jit_arm64.dasc
+450 -240
View File
File diff suppressed because it is too large. Load diff
ext/opcache/jit/zend_jit_arm64.h
+27 -14
View File
@@ -105,28 +105,40 @@ typedef enum _zend_reg {
} zend_reg;
typedef struct _zend_jit_registers_buf {
uint64_t gpr[32]; /* general purpose integer register */
double fpr[32]; /* floating point registers */
uint64_t gpr[32]; /* general purpose integer register */
double fpr[32]; /* floating point registers */
} zend_jit_registers_buf;
#define ZREG_RSP ZREG_X31
#define ZREG_RLR ZREG_X30
#define ZREG_RFP ZREG_X29
#define ZREG_RPR ZREG_X18
#define ZREG_FP ZREG_X27
#define ZREG_IP ZREG_X28
#define ZREG_RX ZREG_IP
#define ZREG_REG0 ZREG_X8
#define ZREG_REG1 ZREG_X9
#define ZREG_REG2 ZREG_X10
#define ZREG_FPR0 ZREG_V0
#define ZREG_FPR1 ZREG_V1
#define ZREG_TMP1 ZREG_X11
#define ZREG_TMP2 ZREG_X12
#define ZREG_TMP3 ZREG_X13
#define ZREG_TMP4 ZREG_X14
#define ZREG_COPY ZREG_REG0
#define ZREG_FIRST_FPR ZREG_V0
#define ZREG_RSP ZREG_X31
#define ZREG_RLR ZREG_X30
#define ZREG_RFP ZREG_X29
#define ZREG_RPR ZREG_X18
# define ZREG_FP ZREG_X27
# define ZREG_IP ZREG_X28
# define ZREG_RX ZREG_IP
typedef uint64_t zend_regset;
# define ZEND_REGSET_FIXED \
(ZEND_REGSET(ZREG_RSP) | ZEND_REGSET(ZREG_RLR) | ZEND_REGSET(ZREG_RFP) | \
ZEND_REGSET(ZREG_RPR) | ZEND_REGSET(ZREG_FP) | ZEND_REGSET(ZREG_IP) | \
ZEND_REGSET_INTERVAL(ZREG_X8, ZREG_X11) | \
ZEND_REGSET_INTERVAL(ZREG_V16, ZREG_V17))
ZEND_REGSET_INTERVAL(ZREG_TMP1, ZREG_TMP4))
# define ZEND_REGSET_GP \
ZEND_REGSET_DIFFERENCE(ZEND_REGSET_INTERVAL(ZREG_X0, ZREG_X30), ZEND_REGSET_FIXED)
# define ZEND_REGSET_FP \
@@ -137,6 +149,7 @@ typedef uint64_t zend_regset;
# define ZEND_REGSET_PRESERVED \
(ZEND_REGSET_INTERVAL(ZREG_X19, ZREG_X28) | ZEND_REGSET_INTERVAL(ZREG_V8, ZREG_V15))
#define ZEND_REGSET_LOW_PRIORITY ZEND_REGSET_EMPTY
#define ZEND_REGSET_LOW_PRIORITY \
(ZEND_REGSET(ZREG_REG0) | ZEND_REGSET(ZREG_REG1) | ZEND_REGSET(ZREG_FPR0) | ZEND_REGSET(ZREG_FPR1))
#endif /* ZEND_JIT_ARM64_H */
ext/opcache/jit/zend_jit_internal.h
+3 -7
View File
@@ -64,11 +64,7 @@
#define ZEND_REGSET_DIFFERENCE(set1, set2) \
((set1) & ~(set2))
#if defined (__aarch64__)
# define ZEND_REGSET_FIRST(set) ((zend_reg)__builtin_ctzll(set))
# define ZEND_REGSET_SECOND(set) ((zend_reg)__builtin_ctzll(set ^ (1ull << ZEND_REGSET_FIRST(set))))
# define ZEND_REGSET_LAST(set) ((zend_reg)(__builtin_clzll(set)^63))
#elif !defined(_WIN32)
#if !defined(_WIN32)
# if (ZREG_NUM <= 32)
# define ZEND_REGSET_FIRST(set) ((zend_reg)__builtin_ctz(set))
# define ZEND_REGSET_LAST(set) ((zend_reg)(__builtin_clz(set)^31))
@@ -76,7 +72,7 @@
# define ZEND_REGSET_FIRST(set) ((zend_reg)__builtin_ctzll(set))
# define ZEND_REGSET_LAST(set) ((zend_reg)(__builtin_clzll(set)^63))
# else
# errir "Too many registers"
# error "Too many registers"
# endif
#else
# include <intrin.h>
@@ -95,7 +91,7 @@ uint32_t __inline __zend_jit_clz(uint32_t value) {
return 32;
}
# define ZEND_REGSET_FIRST(set) ((zend_reg)__zend_jit_ctz(set))
# define ZEND_REGSET_LAST(set) ((zend_reg)(__zend_jit_clz(set)^31)))
# define ZEND_REGSET_LAST(set) ((zend_reg)(__zend_jit_clz(set)^31))
#endif
#define ZEND_REGSET_FOREACH(set, reg) \
ext/opcache/jit/zend_jit_trace.c
+2 -2
View File
@@ -6947,7 +6947,7 @@ static void zend_jit_dump_exit_info(zend_jit_trace_info *t)
} else if (STACK_REG(stack, j) == ZREG_ZVAL_COPY_GPR0) {
fprintf(stderr, " ");
zend_dump_var(op_array, (j < op_array->last_var) ? IS_CV : 0, j);
fprintf(stderr, ":unknown(zval_copy(%s))", zend_reg_name[0]);
fprintf(stderr, ":unknown(zval_copy(%s))", zend_reg_name[ZREG_COPY]);
}
}
fprintf(stderr, "\n");
@@ -7478,7 +7478,7 @@ int ZEND_FASTCALL zend_jit_trace_exit(uint32_t exit_num, zend_jit_registers_buf
} else if (STACK_REG(stack, i) == ZREG_ZVAL_TRY_ADDREF) {
Z_TRY_ADDREF_P(EX_VAR_NUM(i));
} else if (STACK_REG(stack, i) == ZREG_ZVAL_COPY_GPR0) {
zval *val = (zval*)regs->gpr[0];
zval *val = (zval*)regs->gpr[ZREG_COPY];
if (UNEXPECTED(Z_TYPE_P(val) == IS_UNDEF)) {
/* Undefined array index or property */
ext/opcache/jit/zend_jit_x86.h
+1
View File
@@ -88,6 +88,7 @@ typedef struct _zend_jit_registers_buf {
} zend_jit_registers_buf;
#define ZREG_FIRST_FPR ZREG_XMM0
#define ZREG_COPY ZREG_R0
#define ZREG_RAX ZREG_R0
#define ZREG_RCX ZREG_R1