From 692ec7fb6c8132626e3597b753510dd1648ebeed Mon Sep 17 00:00:00 2001 From: Dmitrii Dolgov <9erthalion6@gmail.com> Date: Sat, 11 Jun 2022 11:54:40 +0200 Subject: [PATCH v6 1/2] Add deform_counter At the moment generation_counter includes time spent on both JITing expressions and tuple deforming. Those are configured independently via corresponding options (jit_expressions and jit_tuple_deforming), which means there is no way to find out what fraction of time tuple deforming alone is taking. Add deform_counter dedicated to tuple deforming, which allows seeing more directly the influence jit_tuple_deforming is having on the query. --- doc/src/sgml/jit.sgml | 2 +- src/backend/commands/explain.c | 14 +++++++++++--- src/backend/jit/jit.c | 1 + src/backend/jit/llvm/llvmjit_expr.c | 6 ++++++ src/include/jit/jit.h | 3 +++ 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/doc/src/sgml/jit.sgml b/doc/src/sgml/jit.sgml index 998c972e8ba..1921557cb82 100644 --- a/doc/src/sgml/jit.sgml +++ b/doc/src/sgml/jit.sgml @@ -170,7 +170,7 @@ SET JIT: Functions: 3 Options: Inlining false, Optimization false, Expressions true, Deforming true - Timing: Generation 1.259 ms, Inlining 0.000 ms, Optimization 0.797 ms, Emission 5.048 ms, Total 7.104 ms + Timing: Generation 1.259 ms (Deform 0.000 ms), Inlining 0.000 ms, Optimization 0.797 ms, Emission 5.048 ms, Total 7.104 ms Execution Time: 7.416 ms As visible here, JIT was used, but inlining and diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index 8570b14f621..78cced83931 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -893,6 +893,7 @@ ExplainPrintJIT(ExplainState *es, int jit_flags, JitInstrumentation *ji) /* calculate total time */ INSTR_TIME_SET_ZERO(total_time); + /* don't add deform_counter, it's included into generation_counter */ INSTR_TIME_ADD(total_time, ji->generation_counter); INSTR_TIME_ADD(total_time, ji->inlining_counter); INSTR_TIME_ADD(total_time, ji->optimization_counter); @@ -914,14 +915,15 @@ ExplainPrintJIT(ExplainState *es, int jit_flags, JitInstrumentation *ji) "Inlining", jit_flags & PGJIT_INLINE ? "true" : "false", "Optimization", jit_flags & PGJIT_OPT3 ? "true" : "false", "Expressions", jit_flags & PGJIT_EXPR ? "true" : "false", - "Deforming", jit_flags & PGJIT_DEFORM ? "true" : "false"); + "Deform", jit_flags & PGJIT_DEFORM ? "true" : "false"); if (es->analyze && es->timing) { ExplainIndentText(es); appendStringInfo(es->str, - "Timing: %s %.3f ms, %s %.3f ms, %s %.3f ms, %s %.3f ms, %s %.3f ms\n", + "Timing: %s %.3f ms (%s %.3f ms), %s %.3f ms, %s %.3f ms, %s %.3f ms, %s %.3f ms\n", "Generation", 1000.0 * INSTR_TIME_GET_DOUBLE(ji->generation_counter), + "Deform", 1000.0 * INSTR_TIME_GET_DOUBLE(ji->deform_counter), "Inlining", 1000.0 * INSTR_TIME_GET_DOUBLE(ji->inlining_counter), "Optimization", 1000.0 * INSTR_TIME_GET_DOUBLE(ji->optimization_counter), "Emission", 1000.0 * INSTR_TIME_GET_DOUBLE(ji->emission_counter), @@ -945,9 +947,15 @@ ExplainPrintJIT(ExplainState *es, int jit_flags, JitInstrumentation *ji) { ExplainOpenGroup("Timing", "Timing", true, es); - ExplainPropertyFloat("Generation", "ms", + ExplainOpenGroup("Generation", "Generation", true, es); + ExplainPropertyFloat("Deform", "ms", + 1000.0 * INSTR_TIME_GET_DOUBLE(ji->deform_counter), + 3, es); + ExplainPropertyFloat("Total", "ms", 1000.0 * INSTR_TIME_GET_DOUBLE(ji->generation_counter), 3, es); + ExplainCloseGroup("Generation", "Generation", true, es); + ExplainPropertyFloat("Inlining", "ms", 1000.0 * INSTR_TIME_GET_DOUBLE(ji->inlining_counter), 3, es); diff --git a/src/backend/jit/jit.c b/src/backend/jit/jit.c index fd1cf184c8e..4da8fee20b4 100644 --- a/src/backend/jit/jit.c +++ b/src/backend/jit/jit.c @@ -185,6 +185,7 @@ InstrJitAgg(JitInstrumentation *dst, JitInstrumentation *add) { dst->created_functions += add->created_functions; INSTR_TIME_ADD(dst->generation_counter, add->generation_counter); + INSTR_TIME_ADD(dst->deform_counter, add->deform_counter); INSTR_TIME_ADD(dst->inlining_counter, add->inlining_counter); INSTR_TIME_ADD(dst->optimization_counter, add->optimization_counter); INSTR_TIME_ADD(dst->emission_counter, add->emission_counter); diff --git a/src/backend/jit/llvm/llvmjit_expr.c b/src/backend/jit/llvm/llvmjit_expr.c index 00d7b8110b9..2ac335e2389 100644 --- a/src/backend/jit/llvm/llvmjit_expr.c +++ b/src/backend/jit/llvm/llvmjit_expr.c @@ -121,7 +121,9 @@ llvm_compile_expr(ExprState *state) LLVMValueRef v_aggnulls; instr_time starttime; + instr_time deform_starttime; instr_time endtime; + instr_time deform_endtime; llvm_enter_fatal_on_oom(); @@ -315,10 +317,14 @@ llvm_compile_expr(ExprState *state) */ if (tts_ops && desc && (context->base.flags & PGJIT_DEFORM)) { + INSTR_TIME_SET_CURRENT(deform_starttime); l_jit_deform = slot_compile_deform(context, desc, tts_ops, op->d.fetch.last_var); + INSTR_TIME_SET_CURRENT(deform_endtime); + INSTR_TIME_ACCUM_DIFF(context->base.instr.deform_counter, + deform_endtime, deform_starttime); } if (l_jit_deform) diff --git a/src/include/jit/jit.h b/src/include/jit/jit.h index 14f2e36b371..ed381d8a1c8 100644 --- a/src/include/jit/jit.h +++ b/src/include/jit/jit.h @@ -32,6 +32,9 @@ typedef struct JitInstrumentation /* accumulated time to generate code */ instr_time generation_counter; + /* accumulated time to deform tuples, included into generation_counter */ + instr_time deform_counter; + /* accumulated time for inlining */ instr_time inlining_counter; base-commit: 638d42a3c52081cf4882520f0622161bad69b40f -- 2.32.0