Make tracing JIT to support operator overloading independently from opcache.optimization_level ini directive.

dstogov · dstogov · commit c60d0dc2f41f · 2020-07-09T19:39:12.000+03:00
diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c
@@ -684,15 +684,13 @@ static int zend_jit_op_array_analyze1(const zend_op_array *op_array, zend_script
 	return SUCCESS;
 }
 
-static int zend_jit_op_array_analyze2(const zend_op_array *op_array, zend_script *script, zend_ssa *ssa)
+static int zend_jit_op_array_analyze2(const zend_op_array *op_array, zend_script *script, zend_ssa *ssa, uint32_t optimization_level)
 {
 	if ((JIT_G(opt_level) >= ZEND_JIT_LEVEL_OPT_FUNC)
 	 && ssa->cfg.blocks
 	 && op_array->last_try_catch == 0
 	 && !(op_array->fn_flags & ZEND_ACC_GENERATOR)
 	 && !(ssa->cfg.flags & ZEND_FUNC_INDIRECT_VAR_ACCESS)) {
-
-		uint32_t optimization_level = ZCG(accel_directives).optimization_level;
 		if (zend_ssa_inference(&CG(arena), op_array, script, ssa, optimization_level) != SUCCESS) {
 			return FAILURE;
 		}
@@ -3133,7 +3131,7 @@ static int zend_real_jit_func(zend_op_array *op_array, zend_script *script, cons
 		}
 	}
 
-	if (zend_jit_op_array_analyze2(op_array, script, &ssa) != SUCCESS) {
+	if (zend_jit_op_array_analyze2(op_array, script, &ssa, ZCG(accel_directives).optimization_level) != SUCCESS) {
 		goto jit_failure;
 	}
 
@@ -3458,7 +3456,7 @@ ZEND_EXT_API int zend_jit_script(zend_script *script)
 			}
 			info = ZEND_FUNC_INFO(call_graph.op_arrays[i]);
 			if (info) {
-				if (zend_jit_op_array_analyze2(call_graph.op_arrays[i], script, &info->ssa) != SUCCESS) {
+				if (zend_jit_op_array_analyze2(call_graph.op_arrays[i], script, &info->ssa, ZCG(accel_directives).optimization_level) != SUCCESS) {
 					goto jit_failure;
 				}
 				info->flags = info->ssa.cfg.flags;
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -492,7 +492,7 @@ static zend_ssa *zend_jit_trace_build_ssa(const zend_op_array *op_array, zend_sc
 				}
 			}
 
-			if (zend_jit_op_array_analyze2(op_array, script, ssa) != SUCCESS) {
+			if (zend_jit_op_array_analyze2(op_array, script, ssa, 0) != SUCCESS) {
 				break;
 			}
 
@@ -919,7 +919,7 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin
 	int i, v, idx, len, ssa_ops_count, vars_count, ssa_vars_count;
 	zend_jit_trace_stack *stack;
 	uint32_t build_flags = ZEND_SSA_RC_INFERENCE | ZEND_SSA_USE_CV_RESULTS;
-	uint32_t optimization_level = ZCG(accel_directives).optimization_level;
+	uint32_t optimization_level = 0;
 	int call_level, level, num_op_arrays;
 	size_t frame_size, stack_top, stack_size, stack_bottom;
 	zend_jit_op_array_trace_extension *jit_extension;

Original file line number	Diff line number	Diff line change
`@@ -684,15 +684,13 @@ static int zend_jit_op_array_analyze1(const zend_op_array *op_array, zend_script`
`684`	`684`	`return SUCCESS;`
`685`	`685`	`}`
`686`	`686`
`687`		`-static int zend_jit_op_array_analyze2(const zend_op_array op_array, zend_script script, zend_ssa *ssa)`
	`687`	`+static int zend_jit_op_array_analyze2(const zend_op_array op_array, zend_script script, zend_ssa *ssa, uint32_t optimization_level)`
`688`	`688`	`{`
`689`	`689`	`if ((JIT_G(opt_level) >= ZEND_JIT_LEVEL_OPT_FUNC)`
`690`	`690`	`&& ssa->cfg.blocks`
`691`	`691`	`&& op_array->last_try_catch == 0`
`692`	`692`	`&& !(op_array->fn_flags & ZEND_ACC_GENERATOR)`
`693`	`693`	`&& !(ssa->cfg.flags & ZEND_FUNC_INDIRECT_VAR_ACCESS)) {`
`694`		`-`
`695`		`- uint32_t optimization_level = ZCG(accel_directives).optimization_level;`
`696`	`694`	`if (zend_ssa_inference(&CG(arena), op_array, script, ssa, optimization_level) != SUCCESS) {`
`697`	`695`	`return FAILURE;`
`698`	`696`	`}`
`@@ -3133,7 +3131,7 @@ static int zend_real_jit_func(zend_op_array op_array, zend_script script, cons`
`3133`	`3131`	`}`
`3134`	`3132`	`}`
`3135`	`3133`
`3136`		`- if (zend_jit_op_array_analyze2(op_array, script, &ssa) != SUCCESS) {`
	`3134`	`+ if (zend_jit_op_array_analyze2(op_array, script, &ssa, ZCG(accel_directives).optimization_level) != SUCCESS) {`
`3137`	`3135`	`goto jit_failure;`
`3138`	`3136`	`}`
`3139`	`3137`
`@@ -3458,7 +3456,7 @@ ZEND_EXT_API int zend_jit_script(zend_script *script)`
`3458`	`3456`	`}`
`3459`	`3457`	`info = ZEND_FUNC_INFO(call_graph.op_arrays[i]);`
`3460`	`3458`	`if (info) {`
`3461`		`- if (zend_jit_op_array_analyze2(call_graph.op_arrays[i], script, &info->ssa) != SUCCESS) {`
	`3459`	`+ if (zend_jit_op_array_analyze2(call_graph.op_arrays[i], script, &info->ssa, ZCG(accel_directives).optimization_level) != SUCCESS) {`
`3462`	`3460`	`goto jit_failure;`
`3463`	`3461`	`}`
`3464`	`3462`	`info->flags = info->ssa.cfg.flags;`
Original file line number	Diff line number	Diff line change
`@@ -492,7 +492,7 @@ static zend_ssa zend_jit_trace_build_ssa(const zend_op_array op_array, zend_sc`
`492`	`492`	`}`
`493`	`493`	`}`
`494`	`494`
`495`		`- if (zend_jit_op_array_analyze2(op_array, script, ssa) != SUCCESS) {`
	`495`	`+ if (zend_jit_op_array_analyze2(op_array, script, ssa, 0) != SUCCESS) {`
`496`	`496`	`break;`
`497`	`497`	`}`
`498`	`498`
`@@ -919,7 +919,7 @@ static zend_ssa zend_jit_trace_build_tssa(zend_jit_trace_rec trace_buffer, uin`
`919`	`919`	`int i, v, idx, len, ssa_ops_count, vars_count, ssa_vars_count;`
`920`	`920`	`zend_jit_trace_stack *stack;`
`921`	`921`	`uint32_t build_flags = ZEND_SSA_RC_INFERENCE \| ZEND_SSA_USE_CV_RESULTS;`
`922`		`- uint32_t optimization_level = ZCG(accel_directives).optimization_level;`
	`922`	`+ uint32_t optimization_level = 0;`
`923`	`923`	`int call_level, level, num_op_arrays;`
`924`	`924`	`size_t frame_size, stack_top, stack_size, stack_bottom;`
`925`	`925`	`zend_jit_op_array_trace_extension *jit_extension;`