Update IR

IR commit: 0e3608e3c945140d366134034ee8d86edbe6d050

Author: dstogov

ext/opcache/jit/ir/gen_ir_fold_hash.c

@@ -255,6 +255,9 @@ int main(int argc, char **argv)
 
 	IR_OPS(IR_OP_ADD)
 
+	ir_strtab_lookup(&strtab, "C_INTPTR",  sizeof("C_INTPTR") - 1, IR_C_INTPTR + 1);
+	ir_strtab_lookup(&strtab, "C_UINTPTR", sizeof("C_IINTPTR") - 1, IR_C_UINTPTR + 1);
+
 	while (fgets(buf, sizeof(buf) - 1, f)) {
 		size_t len = strlen(buf);
 		if (len > 0 && (buf[len - 1] == '\r' || buf[len - 1] == '\n')) {

ext/opcache/jit/ir/ir.h

@@ -156,11 +156,15 @@ typedef enum _ir_type {
 # define IR_SSIZE_T    IR_I64
 # define IR_UINTPTR_T  IR_U64
 # define IR_INTPTR_T   IR_I64
+# define IR_C_UINTPTR  IR_U64
+# define IR_C_INTPTR   IR_I64
 #else
 # define IR_SIZE_T     IR_U32
 # define IR_SSIZE_T    IR_I32
 # define IR_UINTPTR_T  IR_U32
 # define IR_INTPTR_T   IR_I32
+# define IR_C_UINTPTR  IR_U32
+# define IR_C_INTPTR   IR_I32
 #endif
 
 /* List of IR opcodes
@@ -839,8 +843,14 @@ int ir_load_llvm_bitcode(ir_loader *loader, const char *filename);
 int ir_load_llvm_asm(ir_loader *loader, const char *filename);
 
 /* IR save API (implementation in ir_save.c) */
+#define IR_SAVE_CFG       (1<<0) /* add info about CFG */
+#define IR_SAVE_CFG_MAP   (1<<1) /* add info about CFG block assignment */
+#define IR_SAVE_USE_LISTS (1<<2) /* add info about def->use lists */
+#define IR_SAVE_RULES     (1<<3) /* add info about selected code-generation rules */
+#define IR_SAVE_REGS      (1<<4) /* add info about selected registers */
+
 void ir_print_proto(const ir_ctx *ctx, ir_ref proto, FILE *f);
-void ir_save(const ir_ctx *ctx, FILE *f);
+void ir_save(const ir_ctx *ctx, uint32_t save_flags, FILE *f);
 
 /* IR debug dump API (implementation in ir_dump.c) */
 void ir_dump(const ir_ctx *ctx, FILE *f);

ext/opcache/jit/ir/ir_dump.c

@@ -511,7 +511,46 @@ void ir_dump_codegen(const ir_ctx *ctx, FILE *f)
 		if ((bb->flags & (IR_BB_START|IR_BB_ENTRY|IR_BB_EMPTY)) == IR_BB_EMPTY) {
 			continue;
 		}
-		fprintf(f, "#BB%d:\n", b);
+
+		fprintf(f, "#BB%d: end=l_%d", b, bb->end);
+		if (bb->flags && IR_BB_UNREACHABLE) {
+			fprintf(f, ", U");
+		}
+		if (bb->dom_parent > 0) {
+			fprintf(f, ", idom=BB%d(%d)", bb->dom_parent, bb->dom_depth);
+		}
+		if (bb->loop_depth != 0) {
+			if (bb->flags & IR_BB_LOOP_HEADER) {
+				if (bb->loop_header > 0) {
+					fprintf(f, ", loop=HDR,BB%d(%d)", bb->loop_header, bb->loop_depth);
+				} else {
+					IR_ASSERT(bb->loop_depth == 1);
+					fprintf(f, ", loop=HDR(%d)", bb->loop_depth);
+				}
+			} else {
+				IR_ASSERT(bb->loop_header > 0);
+				fprintf(f, ", loop=BB%d(%d)", bb->loop_header, bb->loop_depth);
+			}
+		}
+		if (bb->predecessors_count) {
+			uint32_t i;
+
+			fprintf(f, ", pred(%d)=[BB%d", bb->predecessors_count, ctx->cfg_edges[bb->predecessors]);
+			for (i = 1; i < bb->predecessors_count; i++) {
+				fprintf(f, ", BB%d", ctx->cfg_edges[bb->predecessors + i]);
+			}
+			fprintf(f, "]");
+		}
+		if (bb->successors_count) {
+			uint32_t i;
+
+			fprintf(f, ", succ(%d)=[BB%d", bb->successors_count, ctx->cfg_edges[bb->successors]);
+			for (i = 1; i < bb->successors_count; i++) {
+				fprintf(f, ", BB%d", ctx->cfg_edges[bb->successors + i]);
+			}
+			fprintf(f, "]");
+		}
+		fprintf(f, "\n");
 
 		for (i = bb->start, insn = ctx->ir_base + i; i <= bb->end;) {
 			flags = ir_op_flags[insn->op];
@@ -682,8 +721,14 @@ void ir_dump_codegen(const ir_ctx *ctx, FILE *f)
 				}
 			}
 			succ = ir_skip_empty_target_blocks(ctx, succ);
-			if (succ != b + 1) {
-				fprintf(f, "\t# GOTO BB%d\n", succ);
+			if (ctx->cfg_schedule) {
+				if (_b == ctx->cfg_blocks_count || succ != ctx->cfg_schedule[_b + 1]) {
+					fprintf(f, "\t# GOTO BB%d\n", succ);
+				}
+			} else {
+				if (succ != b + 1) {
+					fprintf(f, "\t# GOTO BB%d\n", succ);
+				}
 			}
 		} else if (insn->op == IR_IF) {
 			uint32_t true_block, false_block;

ext/opcache/jit/ir/ir_fold.h

@@ -299,8 +299,12 @@ IR_FOLD(ADD(C_U64, C_U64))
 }
 
 IR_FOLD(ADD(C_ADDR, C_ADDR))
+IR_FOLD(ADD(C_ADDR, C_INTPTR))
+IR_FOLD(ADD(C_ADDR, C_UINTPTR))
+IR_FOLD(ADD(C_INTPTR, C_ADDR))
+IR_FOLD(ADD(C_UINTPTR, C_ADDR))
 {
-	IR_ASSERT(IR_OPT_TYPE(opt) == op1_insn->type);
+//	IR_ASSERT(IR_OPT_TYPE(opt) == op1_insn->type);
 	IR_FOLD_CONST_U(op1_insn->val.addr + op2_insn->val.addr);
 }
 
@@ -365,8 +369,12 @@ IR_FOLD(SUB(C_U64, C_U64))
 }
 
 IR_FOLD(SUB(C_ADDR, C_ADDR))
+IR_FOLD(SUB(C_ADDR, C_INTPTR))
+IR_FOLD(SUB(C_ADDR, C_UINTPTR))
+IR_FOLD(SUB(C_INTPTR, C_ADDR))
+IR_FOLD(SUB(C_UINTPTR, C_ADDR))
 {
-	IR_ASSERT(IR_OPT_TYPE(opt) == op1_insn->type);
+//	IR_ASSERT(IR_OPT_TYPE(opt) == op1_insn->type);
 	IR_FOLD_CONST_U(op1_insn->val.addr - op2_insn->val.addr);
 }
 
@@ -431,8 +439,12 @@ IR_FOLD(MUL(C_U64, C_U64))
 }
 
 IR_FOLD(MUL(C_ADDR, C_ADDR))
+IR_FOLD(MUL(C_ADDR, C_INTPTR))
+IR_FOLD(MUL(C_ADDR, C_UINTPTR))
+IR_FOLD(MUL(C_INTPTR, C_ADDR))
+IR_FOLD(MUL(C_UINTPTR, C_ADDR))
 {
-	IR_ASSERT(IR_OPT_TYPE(opt) == op1_insn->type);
+//	IR_ASSERT(IR_OPT_TYPE(opt) == op1_insn->type);
 	IR_FOLD_CONST_U(op1_insn->val.addr * op2_insn->val.addr);
 }