JIT for STRLEN

Author: dstogov

ext/opcache/jit/zend_jit.c

@@ -2803,6 +2803,15 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
 							goto jit_failure;
 						}
 						goto done;
+					case ZEND_STRLEN:
+						op1_info = OP1_INFO();
+						if ((op1_info & (MAY_BE_UNDEF|MAY_BE_ANY|MAY_BE_REF)) != MAY_BE_STRING) {
+							break;
+						}
+						if (!zend_jit_strlen(&dasm_state, opline, op_array, op1_info)) {
+							goto jit_failure;
+						}
+						goto done;
 					case ZEND_SWITCH_LONG:
 					case ZEND_SWITCH_STRING:
 						if (!zend_jit_switch(&dasm_state, opline, op_array, ssa)) {

ext/opcache/jit/zend_jit_trace.c

@@ -1243,6 +1243,7 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin
 				case ZEND_JMPZ_EX:
 				case ZEND_JMPNZ_EX:
 				case ZEND_ECHO:
+				case ZEND_STRLEN:
 					if (tssa->ops[idx].op1_use >= 0 && op1_type != IS_UNKNOWN) {
 						zend_ssa_var_info *info = &ssa_var_info[ssa_ops[idx].op1_use];
 						if ((info->type & (MAY_BE_ANY|MAY_BE_UNDEF)) != (1 << op1_type)) {
@@ -2634,6 +2635,16 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 							goto jit_failure;
 						}
 						goto done;
+					case ZEND_STRLEN:
+						op1_info = OP1_INFO();
+						CHECK_OP1_TRACE_TYPE();
+						if ((op1_info & (MAY_BE_UNDEF|MAY_BE_ANY|MAY_BE_REF)) != MAY_BE_STRING) {
+							break;
+						}
+						if (!zend_jit_strlen(&dasm_state, opline, op_array, op1_info)) {
+							goto jit_failure;
+						}
+						goto done;
 #if 0
 					case ZEND_SWITCH_LONG:
 					case ZEND_SWITCH_STRING:

ext/opcache/jit/zend_jit_x86.dasc

@@ -10461,10 +10461,10 @@ static int zend_jit_free(dasm_State **Dst, const zend_op *opline, const zend_op_
 
 static int zend_jit_echo(dasm_State **Dst, const zend_op *opline, const zend_op_array *op_array, uint32_t op1_info)
 {
-	zval *zv;
-	size_t len;
-
 	if (opline->op1_type == IS_CONST) {
+		zval *zv;
+		size_t len;
+
 		zv = RT_CONSTANT(opline, opline->op1);
 		ZEND_ASSERT(Z_TYPE_P(zv) == IS_STRING);
 		len = Z_STRLEN_P(zv);
@@ -10517,6 +10517,36 @@ static int zend_jit_echo(dasm_State **Dst, const zend_op *opline, const zend_op_
 	return 1;
 }
 
+static int zend_jit_strlen(dasm_State **Dst, const zend_op *opline, const zend_op_array *op_array, uint32_t op1_info)
+{
+	zend_jit_addr res_addr = RES_ADDR();
+
+	if (opline->op1_type == IS_CONST) {
+		zval *zv;
+		size_t len;
+
+		zv = RT_CONSTANT(opline, opline->op1);
+		ZEND_ASSERT(Z_TYPE_P(zv) == IS_STRING);
+		len = Z_STRLEN_P(zv);
+
+		|	SET_ZVAL_LVAL res_addr, len
+		|	SET_ZVAL_TYPE_INFO res_addr, IS_LONG
+	} else {
+		zend_jit_addr op1_addr = OP1_ADDR();
+
+		ZEND_ASSERT((op1_info & (MAY_BE_UNDEF|MAY_BE_ANY|MAY_BE_REF)) == MAY_BE_STRING);
+
+		|	GET_ZVAL_PTR r0, op1_addr
+		|	mov r0, aword [r0 + offsetof(zend_string, len)]
+		|	SET_ZVAL_LVAL res_addr, r0
+		|	SET_ZVAL_TYPE_INFO res_addr, IS_LONG
+		if (opline->op1_type & (IS_VAR|IS_TMP_VAR)) {
+			|	ZVAL_PTR_DTOR op1_addr, op1_info, 0, 0, opline
+		}
+	}
+	return 1;
+}
+
 static int zend_jit_switch(dasm_State **Dst, const zend_op *opline, const zend_op_array *op_array, zend_ssa *ssa)
 {
 	HashTable *jumptable = Z_ARRVAL_P(RT_CONSTANT(opline, opline->op2));