* [igt-dev] [PATCH i-g-t 1/2] lib/i915/perf: remove generation code for mathml render
@ 2020-03-10 16:29 Lionel Landwerlin
2020-03-10 16:29 ` [igt-dev] [PATCH i-g-t 2/2] lib/i915/perf: break generated code in separate files Lionel Landwerlin
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Lionel Landwerlin @ 2020-03-10 16:29 UTC (permalink / raw)
To: igt-dev
Gputop had support for generating mathml figures of the post
processing equations. It's not useful here.
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
lib/i915/perf-configs/perf-codegen.py | 168 +++-----------------------
1 file changed, 17 insertions(+), 151 deletions(-)
diff --git a/lib/i915/perf-configs/perf-codegen.py b/lib/i915/perf-configs/perf-codegen.py
index 24c5514d..ac3ad683 100755
--- a/lib/i915/perf-configs/perf-codegen.py
+++ b/lib/i915/perf-configs/perf-codegen.py
@@ -36,109 +36,6 @@ c = None
hashed_funcs = {}
xml_equations = None
-def check_operand_type(set, arg):
- if arg.isdigit():
- return "\n<mn>" + arg + "</mn>"
- elif arg[0] == "$":
- if arg in set.counter_vars:
- description = set.counter_vars[arg].get('description')
- elif arg in hw_vars and 'desc' in hw_vars[arg]:
- description = hw_vars[arg]['desc'];
- else:
- description = None
-
- if description != None:
- return "\n<maction actiontype='tooltip'>\n<mi>" + arg + "</mi>\n<mtext>" + description + "</mtext>\n</maction>"
- else:
- return "<mi>" + arg + "</mi>"
- return arg
-
-# http://en.cppreference.com/w/c/language/operator_precedence
-and_precedence = 8
-shft_precedence = 5
-mul_precedence = 3
-add_precedence = 2
-sub_precedence = 2
-default_precedence = 16 #a high value which denotes no brackets needed
-
-def put_brackets(arg):
- return "\n<mtext>(</mtext>" + arg + "\n<mtext>)</mtext>"
-
-def mathml_splice_add(set, args):
- operand_0 = check_operand_type(set, args[0][0])
- operand_1 = check_operand_type(set, args[1][0])
- if args[0][1] < add_precedence:
- operand_0 = put_brackets(args[0][0])
- if args[1][1] < add_precedence:
- operand_1 = put_brackets(args[1][0])
- return [operand_1 + "\n<mo>+</mo>" + operand_0, add_precedence]
-
-def mathml_splice_div(set, args):
- operand_0 = check_operand_type(set, args[0][0])
- operand_1 = check_operand_type(set, args[1][0])
- return ["\n<mfrac>\n<mrow>" + operand_1 + "\n</mrow>\n<mrow>" + operand_0 + "</mrow>\n</mfrac>", default_precedence]
-
-def mathml_splice_max(set, args):
- operand_0 = check_operand_type(set, args[0][0])
- operand_1 = check_operand_type(set, args[1][0])
- return ["\n<mtext>max ( </mtext>" + operand_1 + "\n<mtext> , </mtext>" + operand_0 + "\n<mtext> ) </mtext>", default_precedence]
-
-def mathml_splice_mul(set, args):
- operand_0 = check_operand_type(set, args[0][0])
- operand_1 = check_operand_type(set, args[1][0])
- if args[0][1] < mul_precedence:
- operand_0 = put_brackets(args[0][0])
- if args[1][1] < mul_precedence:
- operand_1 = put_brackets(args[1][0])
- return [operand_1 + "\n<mo>*</mo>" + operand_0, mul_precedence]
-
-def mathml_splice_sub(set, args):
- operand_0 = check_operand_type(set, args[0][0])
- operand_1 = check_operand_type(set, args[1][0])
- if args[0][1] < sub_precedence:
- operand_0 = put_brackets(args[0][0])
- if args[1][1] < sub_precedence:
- operand_1 = put_brackets(args[1][0])
- return [operand_1 + "\n<mo>-</mo>" + operand_0, sub_precedence]
-
-def mathml_splice_read(set, args):
- return ["\n<maction actiontype='tooltip'>\n<mi>" + args[1][0] + args[0][0] + "</mi>\n<mtext>placeholder</mtext>\n</maction>", default_precedence]
-
-def mathml_splice_read_reg(set, args):
- return ["\n<maction actiontype='tooltip'>\n<mi>" + args[0][0] + "</mi>\n<mtext>placeholder</mtext>\n</maction>", default_precedence]
-
-def mathml_splice_min(set, args):
- operand_0 = check_operand_type(set, args[0][0])
- operand_1 = check_operand_type(set, args[1][0])
- return ["\n<mtext>min ( </mtext>" + operand_1 + "\n<mtext> , </mtext>" + operand_0 + "\n<mtext> ) </mtext>", default_precedence]
-
-def mathml_splice_lshft(set, args):
- operand_0 = check_operand_type(set, args[0][0])
- operand_1 = check_operand_type(set, args[1][0])
- if args[0][1] < shft_precedence:
- operand_0 = put_brackets(args[0][0])
- if args[1][1] < shft_precedence:
- operand_1 = put_brackets(args[1][0])
- return [operand_1 + "\n<mo><<</mo>" + operand_0, shft_precedence]
-
-def mathml_splice_rshft(set, args):
- operand_0 = check_operand_type(set, args[0][0])
- operand_1 = check_operand_type(set, args[1][0])
- if args[0][1] < mul_precedence:
- operand_0 = put_brackets(args[0][0])
- if args[1][1] < mul_precedence:
- operand_1 = put_brackets(args[1][0])
- return [operand_1 + "\n<mo>>></mo>" + operand_0, mul_precedence]
-
-def mathml_splice_and(set, args):
- operand_0 = check_operand_type(set, args[0][0])
- operand_1 = check_operand_type(set, args[1][0])
- if args[0][1] < and_precedence:
- operand_0 = put_brackets(args[0][0])
- if args[1][1] < and_precedence:
- operand_1 = put_brackets(args[1][0])
- return [operand_1 + "\n<mo>&</mo>" + operand_0, and_precedence]
-
def emit_fadd(tmp_id, args):
c("double tmp{0} = {1} + {2};".format(tmp_id, args[1], args[0]))
return tmp_id + 1
@@ -212,22 +109,22 @@ def emit_and(tmp_id, args):
return tmp_id + 1
ops = {}
-# (n operands, emitter1, emitter2)
-ops["FADD"] = (2, emit_fadd, mathml_splice_add)
-ops["FDIV"] = (2, emit_fdiv, mathml_splice_div)
-ops["FMAX"] = (2, emit_fmax, mathml_splice_max)
-ops["FMUL"] = (2, emit_fmul, mathml_splice_mul)
-ops["FSUB"] = (2, emit_fsub, mathml_splice_sub)
-ops["READ"] = (2, emit_read, mathml_splice_read)
-ops["READ_REG"] = (1, emit_read_reg, mathml_splice_read_reg)
-ops["UADD"] = (2, emit_uadd, mathml_splice_add)
-ops["UDIV"] = (2, emit_udiv, mathml_splice_div)
-ops["UMUL"] = (2, emit_umul, mathml_splice_mul)
-ops["USUB"] = (2, emit_usub, mathml_splice_sub)
-ops["UMIN"] = (2, emit_umin, mathml_splice_min)
-ops["<<"] = (2, emit_lshft, mathml_splice_lshft)
-ops[">>"] = (2, emit_rshft, mathml_splice_rshft)
-ops["AND"] = (2, emit_and, mathml_splice_and)
+# (n operands, emitter)
+ops["FADD"] = (2, emit_fadd)
+ops["FDIV"] = (2, emit_fdiv)
+ops["FMAX"] = (2, emit_fmax)
+ops["FMUL"] = (2, emit_fmul)
+ops["FSUB"] = (2, emit_fsub)
+ops["READ"] = (2, emit_read)
+ops["READ_REG"] = (1, emit_read_reg)
+ops["UADD"] = (2, emit_uadd)
+ops["UDIV"] = (2, emit_udiv)
+ops["UMUL"] = (2, emit_umul)
+ops["USUB"] = (2, emit_usub)
+ops["UMIN"] = (2, emit_umin)
+ops["<<"] = (2, emit_lshft)
+ops[">>"] = (2, emit_rshft)
+ops["AND"] = (2, emit_and)
def brkt(subexp):
if " " in subexp:
@@ -270,27 +167,6 @@ hw_vars = {
"$QueryMode": { 'c': "perf->devinfo.query_mode" },
}
-def splice_mathml_expression(set, equation, tag):
- tokens = equation.split()
- mathml_stack = []
- tmp_xml_operand = ""
- for token in tokens:
- if not mathml_stack:
- token = check_operand_type(set, token)
- mathml_stack.append([token, default_precedence])
- while mathml_stack and mathml_stack[-1][0] in ops:
- op = mathml_stack.pop()[0]
- argc, callback, mathml_callback = ops[op]
- xml_args = []
- for i in range(0, argc):
- xml_operand = mathml_stack.pop()
- xml_args.append(xml_operand)
- tmp_xml_operand = mathml_callback(set, xml_args)
- mathml_stack.append(tmp_xml_operand)
- xml_string = mathml_stack.pop()[0]
- equation_descr = "<mi>" + tag + "</mi><mo> = </mo>"
- return "<mathml_" + tag + ">" + equation_descr + xml_string + "</mathml_" + tag + ">"
-
def output_rpn_equation_code(set, counter, equation):
c("/* RPN equation: " + equation + " */")
tokens = equation.split()
@@ -302,7 +178,7 @@ def output_rpn_equation_code(set, counter, equation):
stack.append(token)
while stack and stack[-1] in ops:
op = stack.pop()
- argc, callback, mathml_callback = ops[op]
+ argc, callback = ops[op]
args = []
for i in range(0, argc):
operand = stack.pop()
@@ -656,7 +532,6 @@ def main():
parser = argparse.ArgumentParser()
parser.add_argument("--header", help="Header file to write")
parser.add_argument("--code", help="C file to write")
- parser.add_argument("--xml-out", help="Output XML files (adding mathml equations)")
parser.add_argument("xml_files", nargs='+', help="List of xml metrics files to process")
args = parser.parse_args()
@@ -669,15 +544,6 @@ def main():
for xml_file in args.xml_files:
gens.append(Gen(xml_file))
- if args.xml_out:
- for gen in gens:
- for set in gen.sets:
- for counter in set.counters:
- xml_equation = splice_mathml_expression(set, counter.get('equation'), "EQ")
- counter.append(et.fromstring(xml_equation))
- gen.xml.write(gen.filename)
-
-
copyright = textwrap.dedent("""\
/* Autogenerated file, DO NOT EDIT manually! generated by {}
*
--
2.25.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [igt-dev] [PATCH i-g-t 2/2] lib/i915/perf: break generated code in separate files
2020-03-10 16:29 [igt-dev] [PATCH i-g-t 1/2] lib/i915/perf: remove generation code for mathml render Lionel Landwerlin
@ 2020-03-10 16:29 ` Lionel Landwerlin
2020-03-10 16:31 ` Lionel Landwerlin
2020-03-10 16:40 ` [igt-dev] ✗ GitLab.Pipeline: warning for series starting with [i-g-t,1/2] lib/i915/perf: remove generation code for mathml render Patchwork
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Lionel Landwerlin @ 2020-03-10 16:29 UTC (permalink / raw)
To: igt-dev
Initially all the generated code was per generation. Eventually we
grouped it into a single file to reuse as much as possible equation
code (this reduce binary size by a factor). So many equations are just
the same from generation to generation.
But this generated file is 200k lines long...
This change puts all the metrics into a single file and then breaks
down the metric sets per generation.
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
lib/i915/perf-configs/perf-codegen.py | 311 +++++++++++++++++---------
lib/i915/perf.c | 18 +-
lib/meson.build | 21 +-
3 files changed, 241 insertions(+), 109 deletions(-)
diff --git a/lib/i915/perf-configs/perf-codegen.py b/lib/i915/perf-configs/perf-codegen.py
index ac3ad683..e001fc84 100755
--- a/lib/i915/perf-configs/perf-codegen.py
+++ b/lib/i915/perf-configs/perf-codegen.py
@@ -252,33 +252,51 @@ def data_type_to_ctype(ret_type):
def output_counter_read(gen, set, counter):
+ if counter.read_hash in hashed_funcs:
+ return
+
c("\n")
c("/* {0} :: {1} */".format(set.name, counter.get('name')))
+ ret_type = counter.get('data_type')
+ ret_ctype = data_type_to_ctype(ret_type)
+ read_eq = counter.get('equation')
+
+ c(ret_ctype)
+ c(counter.read_sym + "(const struct intel_perf *perf,\n")
+ c.indent(len(counter.read_sym) + 1)
+ c("const struct intel_perf_metric_set *metric_set,\n")
+ c("uint64_t *accumulator)\n")
+ c.outdent(len(counter.read_sym) + 1)
+
+ c("{")
+ c.indent(4)
+
+ output_rpn_equation_code(set, counter, read_eq)
+
+ c.outdent(4)
+ c("}")
+
+ hashed_funcs[counter.read_hash] = counter.read_sym
+
+
+def output_counter_read_definition(gen, set, counter):
if counter.read_hash in hashed_funcs:
- c("#define %s \\" % counter.read_sym)
- c.indent(4)
- c("%s" % hashed_funcs[counter.read_hash])
- c.outdent(4)
+ h("#define %s \\" % counter.read_sym)
+ h.indent(4)
+ h("%s" % hashed_funcs[counter.read_hash])
+ h.outdent(4)
else:
ret_type = counter.get('data_type')
ret_ctype = data_type_to_ctype(ret_type)
read_eq = counter.get('equation')
- c("static " + ret_ctype)
- c(counter.read_sym + "(const struct intel_perf *perf,\n")
- c.indent(len(counter.read_sym) + 1)
- c("const struct intel_perf_metric_set *metric_set,\n")
- c("uint64_t *accumulator)\n")
- c.outdent(len(counter.read_sym) + 1)
-
- c("{")
- c.indent(4)
-
- output_rpn_equation_code(set, counter, read_eq)
-
- c.outdent(4)
- c("}")
+ h(ret_ctype)
+ h(counter.read_sym + "(const struct intel_perf *perf,\n")
+ h.indent(len(counter.read_sym) + 1)
+ h("const struct intel_perf_metric_set *metric_set,\n")
+ h("uint64_t *accumulator);\n")
+ h.outdent(len(counter.read_sym) + 1)
hashed_funcs[counter.read_hash] = counter.read_sym
@@ -289,33 +307,57 @@ def output_counter_max(gen, set, counter):
if not max_eq or max_eq == "100":
return
+ if counter.max_hash in hashed_funcs:
+ return
+
c("\n")
c("/* {0} :: {1} */".format(set.name, counter.get('name')))
+ ret_type = counter.get('data_type')
+ ret_ctype = data_type_to_ctype(ret_type)
+
+ c(ret_ctype)
+ c(counter.max_sym + "(const struct intel_perf *perf,\n")
+ c.indent(len(counter.max_sym) + 1)
+ c("const struct intel_perf_metric_set *metric_set,\n")
+ c("uint64_t *accumulator)\n")
+ c.outdent(len(counter.max_sym) + 1)
+
+ c("{")
+ c.indent(4)
+
+ output_rpn_equation_code(set, counter, max_eq)
+
+ c.outdent(4)
+ c("}")
+
+ hashed_funcs[counter.max_hash] = counter.max_sym
+
+
+def output_counter_max_definition(gen, set, counter):
+ max_eq = counter.get('max_equation')
+
+ if not max_eq or max_eq == "100":
+ return
+
if counter.max_hash in hashed_funcs:
- c("#define %s \\" % counter.max_sym)
- c.indent(4)
- c("%s" % hashed_funcs[counter.max_hash])
- c.outdent(4)
+ h("#define %s \\" % counter.max_sym)
+ h.indent(4)
+ h("%s" % hashed_funcs[counter.max_hash])
+ h.outdent(4)
+ h("\n")
else:
ret_type = counter.get('data_type')
ret_ctype = data_type_to_ctype(ret_type)
- c("static " + ret_ctype)
+ h(ret_ctype)
- c(counter.max_sym + "(const struct intel_perf *perf,\n")
- c.indent(len(counter.max_sym) + 1)
- c("const struct intel_perf_metric_set *metric_set,\n")
- c("uint64_t *accumulator)\n")
- c.outdent(len(counter.max_sym) + 1)
-
- c("{")
- c.indent(4)
-
- output_rpn_equation_code(set, counter, max_eq)
-
- c.outdent(4)
- c("}")
+ h(counter.max_sym + "(const struct intel_perf *perf,")
+ h.indent(len(counter.max_sym) + 1)
+ h("const struct intel_perf_metric_set *metric_set,")
+ h("uint64_t *accumulator);")
+ h.outdent(len(counter.max_sym) + 1)
+ h("\n")
hashed_funcs[counter.max_hash] = counter.max_sym
@@ -524,65 +566,13 @@ class Gen:
self.sets.append(Set(self, xml_set))
-def main():
- global c
- global h
- global xml_equations
+def generate_equations(args, gens):
+ global hashed_funcs
- parser = argparse.ArgumentParser()
- parser.add_argument("--header", help="Header file to write")
- parser.add_argument("--code", help="C file to write")
- parser.add_argument("xml_files", nargs='+', help="List of xml metrics files to process")
-
- args = parser.parse_args()
-
- # Note: either arg may == None
- h = codegen.Codegen(args.header)
- c = codegen.Codegen(args.code)
-
- gens = []
- for xml_file in args.xml_files:
- gens.append(Gen(xml_file))
-
- copyright = textwrap.dedent("""\
- /* Autogenerated file, DO NOT EDIT manually! generated by {}
- *
- * Copyright (c) 2018 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
- """).format(os.path.basename(__file__))
-
- h(copyright)
- c(copyright)
- c(textwrap.dedent("""\
- #include <stddef.h>
- #include <stdint.h>
- #include <stdbool.h>
- #include <assert.h>
-
- """))
-
- c("#include \"" + os.path.basename(args.header) + "\"")
+ header_file = os.path.basename(args.header)
+ header_define = header_file.replace('.', '_').upper()
+ hashed_funcs = {}
c(textwrap.dedent("""\
#include <stdlib.h>
#include <string.h>
@@ -590,11 +580,12 @@ def main():
#include <i915_drm.h>
#include "i915/perf.h"
+ #include "%s"
#define MIN(x, y) (((x) < (y)) ? (x) : (y))
#define MAX(a, b) (((a) > (b)) ? (a) : (b))
- static double
+ double
percentage_max_callback_float(const struct intel_perf *perf,
const struct intel_perf_metric_set *metric_set,
uint64_t *accumulator)
@@ -602,7 +593,7 @@ def main():
return 100;
}
- static uint64_t
+ uint64_t
percentage_max_callback_uint64(const struct intel_perf *perf,
const struct intel_perf_metric_set *metric_set,
uint64_t *accumulator)
@@ -610,7 +601,7 @@ def main():
return 100;
}
- """))
+ """ % os.path.basename(args.header)))
# Print out all equation functions.
for gen in gens:
@@ -619,6 +610,60 @@ def main():
output_counter_read(gen, set, counter)
output_counter_max(gen, set, counter)
+ hashed_funcs = {}
+ h(textwrap.dedent("""\
+ #ifndef __%s__
+ #define __%s__
+
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <stdbool.h>
+
+ struct intel_perf;
+ struct intel_perf_metric_set;
+
+ double
+ percentage_max_callback_float(const struct intel_perf *perf,
+ const struct intel_perf_metric_set *metric_set,
+ uint64_t *accumulator);
+ uint64_t
+ percentage_max_callback_uint64(const struct intel_perf *perf,
+ const struct intel_perf_metric_set *metric_set,
+ uint64_t *accumulator);
+
+ """ % (header_define, header_define)))
+
+ # Print out all equation functions.
+ for gen in gens:
+ for set in gen.sets:
+ for counter in set.counters:
+ output_counter_read_definition(gen, set, counter)
+ output_counter_max_definition(gen, set, counter)
+
+ h(textwrap.dedent("""\
+
+ #endif /* __%s__ */
+ """ % header_define))
+
+
+def generate_metric_sets(args, gens):
+ header_file = os.path.basename(args.header)
+ header_define = header_file.replace('.', '_').upper()
+
+ c(textwrap.dedent("""\
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <stdlib.h>
+ #include <stdbool.h>
+ #include <assert.h>
+
+ #include "i915_drm.h"
+
+ """))
+
+ c("#include \"{0}\"".format(os.path.basename(args.header)))
+ c("#include \"{0}\"".format(os.path.basename(args.equation_include)))
+
# Print out all set registration functions for each set in each
# generation.
for gen in gens:
@@ -679,15 +724,12 @@ def main():
c("}\n")
h(textwrap.dedent("""\
- #pragma once
+ #ifndef %s
+ #define %s
#include "i915/perf.h"
- #ifdef __cplusplus
- extern "C" {
- #endif
-
- """))
+ """ % (header_define, header_define)))
# Print out all set registration functions for each generation.
for gen in gens:
@@ -705,11 +747,68 @@ def main():
c("}")
h(textwrap.dedent("""\
- #ifdef __cplusplus
- } /* extern C */
- #endif
+ #endif /* %s */
+ """ % header_define))
+
+
+def main():
+ global c
+ global h
+ global xml_equations
+
+ parser = argparse.ArgumentParser()
+ parser.add_argument("--header", help="Header file to write")
+ parser.add_argument("--code", help="C file to write")
+ parser.add_argument("--equations", help="Output equations", action="store_true")
+ parser.add_argument("--metric_sets", help="Output metric sets", action="store_true")
+ parser.add_argument("--equation-include", help="Equation header file")
+ parser.add_argument("xml_files", nargs='+', help="List of xml metrics files to process")
+
+ args = parser.parse_args()
+
+ # Note: either arg may == None
+ h = codegen.Codegen(args.header)
+ c = codegen.Codegen(args.code)
+
+ gens = []
+ for xml_file in args.xml_files:
+ gens.append(Gen(xml_file))
+
+ copyright = textwrap.dedent("""\
+ /* Autogenerated file, DO NOT EDIT manually! generated by {}
+ *
+ * Copyright (c) 2018 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+ """).format(os.path.basename(__file__))
+
+ h(copyright)
+ c(copyright)
+
+ if args.equations:
+ generate_equations(args, gens)
+ if args.metric_sets:
+ generate_metric_sets(args, gens)
- """))
if __name__ == '__main__':
diff --git a/lib/i915/perf.c b/lib/i915/perf.c
index babfe633..8d3e188a 100644
--- a/lib/i915/perf.c
+++ b/lib/i915/perf.c
@@ -37,7 +37,23 @@
#include "intel_chipset.h"
#include "perf.h"
-#include "i915_perf_metrics.h"
+
+#include "i915_perf_metrics_hsw.h"
+#include "i915_perf_metrics_bdw.h"
+#include "i915_perf_metrics_chv.h"
+#include "i915_perf_metrics_sklgt2.h"
+#include "i915_perf_metrics_sklgt3.h"
+#include "i915_perf_metrics_sklgt4.h"
+#include "i915_perf_metrics_kblgt2.h"
+#include "i915_perf_metrics_kblgt3.h"
+#include "i915_perf_metrics_cflgt2.h"
+#include "i915_perf_metrics_cflgt3.h"
+#include "i915_perf_metrics_bxt.h"
+#include "i915_perf_metrics_glk.h"
+#include "i915_perf_metrics_cnl.h"
+#include "i915_perf_metrics_icl.h"
+#include "i915_perf_metrics_ehl.h"
+#include "i915_perf_metrics_tgl.h"
static int
perf_ioctl(int fd, unsigned long request, void *arg)
diff --git a/lib/meson.build b/lib/meson.build
index 8112bec4..f3649615 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -195,16 +195,33 @@ foreach hw : i915_perf_hardware
endforeach
i915_perf_files += custom_target(
- 'i915-perf-metrics',
+ 'i915-perf-equations',
input : i915_xml_files,
- output : [ 'i915_perf_metrics.c', 'i915_perf_metrics.h' ],
+ output : [ 'i915_perf_equations.c', 'i915_perf_equations.h' ],
command : [
find_program('i915/perf-configs/perf-codegen.py'),
'--code', '@OUTPUT0@',
'--header', '@OUTPUT1@',
+ '--equations',
'@INPUT@',
])
+foreach hw : i915_perf_hardware
+ i915_perf_files += custom_target(
+ 'i915-perf-metrics-@0@'.format(hw),
+ input : 'i915/perf-configs/oa-@0@.xml'.format(hw),
+ output : [ 'i915_perf_metrics_@0@.c'.format(hw),
+ 'i915_perf_metrics_@0@.h'.format(hw), ],
+ command : [
+ find_program('i915/perf-configs/perf-codegen.py'),
+ '--code', '@OUTPUT0@',
+ '--header', '@OUTPUT1@',
+ '--metric_sets',
+ '--equation-include', 'i915_perf_equations.h',
+ '@INPUT@',
+ ])
+endforeach
+
lib_igt_i915_perf_build = shared_library(
'i915_perf',
i915_perf_files,
--
2.25.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [igt-dev] [PATCH i-g-t 2/2] lib/i915/perf: break generated code in separate files
2020-03-10 16:29 ` [igt-dev] [PATCH i-g-t 2/2] lib/i915/perf: break generated code in separate files Lionel Landwerlin
@ 2020-03-10 16:31 ` Lionel Landwerlin
0 siblings, 0 replies; 6+ messages in thread
From: Lionel Landwerlin @ 2020-03-10 16:31 UTC (permalink / raw)
To: igt-dev
On 10/03/2020 18:29, Lionel Landwerlin wrote:
> Initially all the generated code was per generation. Eventually we
> grouped it into a single file to reuse as much as possible equation
> code (this reduce binary size by a factor). So many equations are just
> the same from generation to generation.
>
> But this generated file is 200k lines long...
>
> This change puts all the metrics into a single file and then breaks
> down the metric sets per generation.
I meant equations into a single file and then ....
-Lionel
>
> Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 6+ messages in thread
* [igt-dev] ✗ GitLab.Pipeline: warning for series starting with [i-g-t,1/2] lib/i915/perf: remove generation code for mathml render
2020-03-10 16:29 [igt-dev] [PATCH i-g-t 1/2] lib/i915/perf: remove generation code for mathml render Lionel Landwerlin
2020-03-10 16:29 ` [igt-dev] [PATCH i-g-t 2/2] lib/i915/perf: break generated code in separate files Lionel Landwerlin
@ 2020-03-10 16:40 ` Patchwork
2020-03-10 17:00 ` [igt-dev] ✓ Fi.CI.BAT: success " Patchwork
2020-03-10 21:53 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2020-03-10 16:40 UTC (permalink / raw)
To: Lionel Landwerlin; +Cc: igt-dev
== Series Details ==
Series: series starting with [i-g-t,1/2] lib/i915/perf: remove generation code for mathml render
URL : https://patchwork.freedesktop.org/series/74528/
State : warning
== Summary ==
Did not get list of undocumented tests for this run, something is wrong!
Other than that, pipeline status: FAILED.
see https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/pipelines/118228 for the overview.
build:tests-debian-autotools has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/1891147):
make[3]: Entering directory '/builds/gfx-ci/igt-ci-tags/lib'
CC i915/perf.lo
i915/perf.c:41:10: fatal error: i915_perf_metrics_hsw.h: No such file or directory
#include "i915_perf_metrics_hsw.h"
^~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
make[3]: Leaving directory '/builds/gfx-ci/igt-ci-tags/lib'
make[3]: *** [Makefile:929: i915/perf.lo] Error 1
make[2]: *** [Makefile:685: all] Error 2
make[2]: Leaving directory '/builds/gfx-ci/igt-ci-tags/lib'
make[1]: Leaving directory '/builds/gfx-ci/igt-ci-tags'
make[1]: *** [Makefile:515: all-recursive] Error 1
make: *** [Makefile:447: all] Error 2
section_end:1583858259:build_script
section_start:1583858259:after_script
section_end:1583858261:after_script
section_start:1583858261:upload_artifacts_on_failure
section_end:1583858263:upload_artifacts_on_failure
ERROR: Job failed: exit code 1
== Logs ==
For more details see: https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/pipelines/118228
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 6+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/2] lib/i915/perf: remove generation code for mathml render
2020-03-10 16:29 [igt-dev] [PATCH i-g-t 1/2] lib/i915/perf: remove generation code for mathml render Lionel Landwerlin
2020-03-10 16:29 ` [igt-dev] [PATCH i-g-t 2/2] lib/i915/perf: break generated code in separate files Lionel Landwerlin
2020-03-10 16:40 ` [igt-dev] ✗ GitLab.Pipeline: warning for series starting with [i-g-t,1/2] lib/i915/perf: remove generation code for mathml render Patchwork
@ 2020-03-10 17:00 ` Patchwork
2020-03-10 21:53 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2020-03-10 17:00 UTC (permalink / raw)
To: Lionel Landwerlin; +Cc: igt-dev
== Series Details ==
Series: series starting with [i-g-t,1/2] lib/i915/perf: remove generation code for mathml render
URL : https://patchwork.freedesktop.org/series/74528/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8106 -> IGTPW_4286
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/index.html
Known issues
------------
Here are the changes found in IGTPW_4286 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s4-devices:
- fi-icl-guc: [PASS][1] -> [INCOMPLETE][2] ([i915#184])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/fi-icl-guc/igt@gem_exec_suspend@basic-s4-devices.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/fi-icl-guc/igt@gem_exec_suspend@basic-s4-devices.html
* igt@i915_selftest@live@gem_contexts:
- fi-cml-s: [PASS][3] -> [DMESG-FAIL][4] ([i915#877])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/fi-cml-s/igt@i915_selftest@live@gem_contexts.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/fi-cml-s/igt@i915_selftest@live@gem_contexts.html
* igt@prime_self_import@basic-with_one_bo_two_files:
- fi-tgl-y: [PASS][5] -> [DMESG-WARN][6] ([CI#94] / [i915#402])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/fi-tgl-y/igt@prime_self_import@basic-with_one_bo_two_files.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/fi-tgl-y/igt@prime_self_import@basic-with_one_bo_two_files.html
#### Possible fixes ####
* igt@gem_flink_basic@bad-open:
- fi-tgl-y: [DMESG-WARN][7] ([CI#94] / [i915#402]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/fi-tgl-y/igt@gem_flink_basic@bad-open.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/fi-tgl-y/igt@gem_flink_basic@bad-open.html
[CI#94]: https://gitlab.freedesktop.org/gfx-ci/i915-infra/issues/94
[i915#184]: https://gitlab.freedesktop.org/drm/intel/issues/184
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#877]: https://gitlab.freedesktop.org/drm/intel/issues/877
Participating hosts (44 -> 41)
------------------------------
Additional (5): fi-bdw-5557u fi-kbl-7500u fi-cfl-8109u fi-skl-6600u fi-snb-2600
Missing (8): fi-hsw-4200u fi-skl-6770hq fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bsw-nick fi-bdw-samus fi-kbl-r
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5504 -> IGTPW_4286
CI-20190529: 20190529
CI_DRM_8106: 5b0076e8066ea8218e7857ee1aa28b0670acde94 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4286: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/index.html
IGT_5504: d6788bf0404f76b66170e18eb26c85004b5ccb25 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/index.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 6+ messages in thread
* [igt-dev] ✓ Fi.CI.IGT: success for series starting with [i-g-t,1/2] lib/i915/perf: remove generation code for mathml render
2020-03-10 16:29 [igt-dev] [PATCH i-g-t 1/2] lib/i915/perf: remove generation code for mathml render Lionel Landwerlin
` (2 preceding siblings ...)
2020-03-10 17:00 ` [igt-dev] ✓ Fi.CI.BAT: success " Patchwork
@ 2020-03-10 21:53 ` Patchwork
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2020-03-10 21:53 UTC (permalink / raw)
To: Lionel Landwerlin; +Cc: igt-dev
== Series Details ==
Series: series starting with [i-g-t,1/2] lib/i915/perf: remove generation code for mathml render
URL : https://patchwork.freedesktop.org/series/74528/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8106_full -> IGTPW_4286_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/index.html
Known issues
------------
Here are the changes found in IGTPW_4286_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_persistence@close-replace-race:
- shard-tglb: [PASS][1] -> [INCOMPLETE][2] ([i915#1402])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-tglb8/igt@gem_ctx_persistence@close-replace-race.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-tglb7/igt@gem_ctx_persistence@close-replace-race.html
* igt@gem_exec_parallel@vcs1-fds:
- shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#112080]) +9 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb4/igt@gem_exec_parallel@vcs1-fds.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-iclb6/igt@gem_exec_parallel@vcs1-fds.html
* igt@gem_exec_schedule@implicit-read-write-bsd2:
- shard-iclb: [PASS][5] -> [SKIP][6] ([fdo#109276] / [i915#677])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb4/igt@gem_exec_schedule@implicit-read-write-bsd2.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-iclb6/igt@gem_exec_schedule@implicit-read-write-bsd2.html
* igt@gem_exec_schedule@pi-common-bsd:
- shard-iclb: [PASS][7] -> [SKIP][8] ([i915#677]) +2 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb5/igt@gem_exec_schedule@pi-common-bsd.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-iclb1/igt@gem_exec_schedule@pi-common-bsd.html
* igt@gem_exec_schedule@pi-common-bsd1:
- shard-iclb: [PASS][9] -> [SKIP][10] ([fdo#109276]) +11 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb2/igt@gem_exec_schedule@pi-common-bsd1.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-iclb5/igt@gem_exec_schedule@pi-common-bsd1.html
* igt@gem_exec_schedule@wide-bsd:
- shard-iclb: [PASS][11] -> [SKIP][12] ([fdo#112146]) +6 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb7/igt@gem_exec_schedule@wide-bsd.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-iclb4/igt@gem_exec_schedule@wide-bsd.html
* igt@gem_exec_whisper@basic-contexts-all:
- shard-glk: [PASS][13] -> [DMESG-WARN][14] ([i915#118] / [i915#95]) +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-glk2/igt@gem_exec_whisper@basic-contexts-all.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-glk3/igt@gem_exec_whisper@basic-contexts-all.html
* igt@gem_ppgtt@flink-and-close-vma-leak:
- shard-apl: [PASS][15] -> [FAIL][16] ([i915#644])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-apl4/igt@gem_ppgtt@flink-and-close-vma-leak.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-apl6/igt@gem_ppgtt@flink-and-close-vma-leak.html
* igt@gem_userptr_blits@dmabuf-unsync:
- shard-hsw: [PASS][17] -> [DMESG-WARN][18] ([fdo#111870])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-hsw7/igt@gem_userptr_blits@dmabuf-unsync.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-hsw1/igt@gem_userptr_blits@dmabuf-unsync.html
- shard-snb: [PASS][19] -> [DMESG-WARN][20] ([fdo#111870] / [i915#478])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-snb4/igt@gem_userptr_blits@dmabuf-unsync.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-snb5/igt@gem_userptr_blits@dmabuf-unsync.html
* igt@i915_pm_rpm@dpms-lpsp:
- shard-iclb: [PASS][21] -> [SKIP][22] ([i915#1316])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb4/igt@i915_pm_rpm@dpms-lpsp.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-iclb1/igt@i915_pm_rpm@dpms-lpsp.html
- shard-tglb: [PASS][23] -> [SKIP][24] ([i915#1316])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-tglb5/igt@i915_pm_rpm@dpms-lpsp.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-tglb3/igt@i915_pm_rpm@dpms-lpsp.html
* igt@i915_pm_rps@reset:
- shard-iclb: [PASS][25] -> [FAIL][26] ([i915#413]) +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb7/igt@i915_pm_rps@reset.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-iclb1/igt@i915_pm_rps@reset.html
* igt@kms_big_fb@x-tiled-32bpp-rotate-180:
- shard-kbl: [PASS][27] -> [DMESG-FAIL][28] ([i915#95])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-kbl4/igt@kms_big_fb@x-tiled-32bpp-rotate-180.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-kbl2/igt@kms_big_fb@x-tiled-32bpp-rotate-180.html
* igt@kms_cursor_crc@pipe-a-cursor-256x85-random:
- shard-kbl: [PASS][29] -> [FAIL][30] ([i915#54])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-kbl4/igt@kms_cursor_crc@pipe-a-cursor-256x85-random.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-kbl3/igt@kms_cursor_crc@pipe-a-cursor-256x85-random.html
- shard-apl: [PASS][31] -> [FAIL][32] ([i915#54])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-apl1/igt@kms_cursor_crc@pipe-a-cursor-256x85-random.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-apl8/igt@kms_cursor_crc@pipe-a-cursor-256x85-random.html
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-kbl: [PASS][33] -> [DMESG-WARN][34] ([i915#180]) +3 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-kbl7/igt@kms_cursor_crc@pipe-a-cursor-suspend.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-kbl7/igt@kms_cursor_crc@pipe-a-cursor-suspend.html
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-apl: [PASS][35] -> [DMESG-WARN][36] ([i915#180]) +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-apl4/igt@kms_frontbuffer_tracking@fbc-suspend.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-apl4/igt@kms_frontbuffer_tracking@fbc-suspend.html
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [PASS][37] -> [SKIP][38] ([fdo#109642] / [fdo#111068])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb2/igt@kms_psr2_su@frontbuffer.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-iclb4/igt@kms_psr2_su@frontbuffer.html
* igt@kms_psr@no_drrs:
- shard-iclb: [PASS][39] -> [FAIL][40] ([i915#173])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb6/igt@kms_psr@no_drrs.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-iclb1/igt@kms_psr@no_drrs.html
* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-iclb: [PASS][41] -> [SKIP][42] ([fdo#109441]) +1 similar issue
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-iclb3/igt@kms_psr@psr2_cursor_mmap_cpu.html
* igt@kms_setmode@basic:
- shard-apl: [PASS][43] -> [FAIL][44] ([i915#31])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-apl1/igt@kms_setmode@basic.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-apl8/igt@kms_setmode@basic.html
* igt@kms_vblank@pipe-a-wait-idle-hang:
- shard-hsw: [PASS][45] -> [DMESG-WARN][46] ([i915#44])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-hsw7/igt@kms_vblank@pipe-a-wait-idle-hang.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-hsw5/igt@kms_vblank@pipe-a-wait-idle-hang.html
#### Possible fixes ####
* igt@gem_ctx_isolation@rcs0-s3:
- shard-kbl: [DMESG-WARN][47] ([i915#180]) -> [PASS][48] +1 similar issue
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-kbl1/igt@gem_ctx_isolation@rcs0-s3.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-kbl3/igt@gem_ctx_isolation@rcs0-s3.html
* igt@gem_ctx_persistence@close-replace-race:
- shard-kbl: [INCOMPLETE][49] ([i915#1402]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-kbl4/igt@gem_ctx_persistence@close-replace-race.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-kbl6/igt@gem_ctx_persistence@close-replace-race.html
- shard-apl: [INCOMPLETE][51] ([fdo#103927] / [i915#1402]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-apl1/igt@gem_ctx_persistence@close-replace-race.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-apl6/igt@gem_ctx_persistence@close-replace-race.html
* igt@gem_ctx_persistence@processes:
- shard-kbl: [FAIL][53] ([i915#570] / [i915#679]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-kbl2/igt@gem_ctx_persistence@processes.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-kbl7/igt@gem_ctx_persistence@processes.html
* igt@gem_ctx_shared@q-smoketest-bsd2:
- shard-iclb: [SKIP][55] ([fdo#109276]) -> [PASS][56] +17 similar issues
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb3/igt@gem_ctx_shared@q-smoketest-bsd2.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-iclb4/igt@gem_ctx_shared@q-smoketest-bsd2.html
* igt@gem_exec_balancer@hang:
- shard-tglb: [FAIL][57] ([i915#1277]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-tglb1/igt@gem_exec_balancer@hang.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-tglb7/igt@gem_exec_balancer@hang.html
* igt@gem_exec_schedule@implicit-read-write-bsd1:
- shard-iclb: [SKIP][59] ([fdo#109276] / [i915#677]) -> [PASS][60] +3 similar issues
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb6/igt@gem_exec_schedule@implicit-read-write-bsd1.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-iclb1/igt@gem_exec_schedule@implicit-read-write-bsd1.html
* igt@gem_exec_schedule@pi-distinct-iova-bsd:
- shard-iclb: [SKIP][61] ([i915#677]) -> [PASS][62] +1 similar issue
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb2/igt@gem_exec_schedule@pi-distinct-iova-bsd.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-iclb7/igt@gem_exec_schedule@pi-distinct-iova-bsd.html
* igt@gem_exec_schedule@preempt-other-chain-bsd:
- shard-iclb: [SKIP][63] ([fdo#112146]) -> [PASS][64] +4 similar issues
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb4/igt@gem_exec_schedule@preempt-other-chain-bsd.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-iclb5/igt@gem_exec_schedule@preempt-other-chain-bsd.html
* igt@gem_exec_whisper@basic-queues-forked:
- shard-glk: [DMESG-WARN][65] ([i915#118] / [i915#95]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-glk2/igt@gem_exec_whisper@basic-queues-forked.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-glk2/igt@gem_exec_whisper@basic-queues-forked.html
* igt@gem_softpin@noreloc-s3:
- shard-apl: [DMESG-WARN][67] ([i915#180]) -> [PASS][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-apl4/igt@gem_softpin@noreloc-s3.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-apl1/igt@gem_softpin@noreloc-s3.html
* igt@i915_pm_rps@reset:
- shard-tglb: [FAIL][69] ([i915#413]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-tglb1/igt@i915_pm_rps@reset.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-tglb8/igt@i915_pm_rps@reset.html
* igt@i915_suspend@sysfs-reader:
- shard-snb: [DMESG-WARN][71] ([i915#42]) -> [PASS][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-snb4/igt@i915_suspend@sysfs-reader.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-snb6/igt@i915_suspend@sysfs-reader.html
* igt@kms_cursor_crc@pipe-b-cursor-64x64-offscreen:
- shard-apl: [FAIL][73] ([i915#54]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-apl6/igt@kms_cursor_crc@pipe-b-cursor-64x64-offscreen.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-apl3/igt@kms_cursor_crc@pipe-b-cursor-64x64-offscreen.html
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- shard-kbl: [INCOMPLETE][75] -> [PASS][76]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-kbl2/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-kbl2/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-glk: [FAIL][77] ([i915#899]) -> [PASS][78]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-glk9/igt@kms_plane_lowres@pipe-a-tiling-x.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-glk9/igt@kms_plane_lowres@pipe-a-tiling-x.html
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [SKIP][79] ([fdo#109441]) -> [PASS][80] +1 similar issue
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb8/igt@kms_psr@psr2_sprite_plane_move.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
* igt@perf_pmu@init-busy-vcs1:
- shard-iclb: [SKIP][81] ([fdo#112080]) -> [PASS][82] +10 similar issues
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb7/igt@perf_pmu@init-busy-vcs1.html
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-iclb2/igt@perf_pmu@init-busy-vcs1.html
* igt@prime_vgem@basic-gtt:
- shard-snb: [DMESG-WARN][83] ([i915#478]) -> [PASS][84]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-snb4/igt@prime_vgem@basic-gtt.html
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-snb5/igt@prime_vgem@basic-gtt.html
#### Warnings ####
* igt@gem_linear_blits@normal:
- shard-apl: [TIMEOUT][85] ([i915#1322]) -> [TIMEOUT][86] ([fdo#111732] / [i915#1322])
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-apl4/igt@gem_linear_blits@normal.html
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-apl7/igt@gem_linear_blits@normal.html
* igt@gem_softpin@noreloc-s3:
- shard-kbl: [DMESG-WARN][87] ([i915#180]) -> [FAIL][88] ([fdo#103375])
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-kbl2/igt@gem_softpin@noreloc-s3.html
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-kbl1/igt@gem_softpin@noreloc-s3.html
* igt@gem_userptr_blits@dmabuf-sync:
- shard-snb: [DMESG-WARN][89] ([fdo#110789] / [fdo#111870] / [i915#478]) -> [DMESG-WARN][90] ([fdo#111870] / [i915#478])
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-snb6/igt@gem_userptr_blits@dmabuf-sync.html
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-snb6/igt@gem_userptr_blits@dmabuf-sync.html
- shard-hsw: [DMESG-WARN][91] ([fdo#110789] / [fdo#111870]) -> [DMESG-WARN][92] ([fdo#111870])
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-hsw8/igt@gem_userptr_blits@dmabuf-sync.html
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-hsw1/igt@gem_userptr_blits@dmabuf-sync.html
* igt@i915_pm_rpm@fences:
- shard-snb: [INCOMPLETE][93] ([i915#82]) -> [SKIP][94] ([fdo#109271])
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-snb4/igt@i915_pm_rpm@fences.html
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-snb2/igt@i915_pm_rpm@fences.html
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-kbl: [DMESG-WARN][95] ([i915#180] / [i915#56]) -> [DMESG-WARN][96] ([i915#180])
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-kbl1/igt@kms_flip@flip-vs-suspend-interruptible.html
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-kbl2/igt@kms_flip@flip-vs-suspend-interruptible.html
* igt@runner@aborted:
- shard-kbl: ([FAIL][97], [FAIL][98]) ([i915#1389] / [i915#1402] / [i915#92]) -> [FAIL][99] ([i915#92])
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-kbl7/igt@runner@aborted.html
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-kbl4/igt@runner@aborted.html
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-kbl7/igt@runner@aborted.html
- shard-apl: ([FAIL][100], [FAIL][101]) ([fdo#103927] / [i915#1402]) -> [FAIL][102] ([fdo#103927])
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-apl1/igt@runner@aborted.html
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-apl2/igt@runner@aborted.html
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/shard-apl4/igt@runner@aborted.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110789]: https://bugs.freedesktop.org/show_bug.cgi?id=110789
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111732]: https://bugs.freedesktop.org/show_bug.cgi?id=111732
[fdo#111870]: https://bugs.freedesktop.org/show_bug.cgi?id=111870
[fdo#112080]: https://bugs.freedesktop.org/show_bug.cgi?id=112080
[fdo#112146]: https://bugs.freedesktop.org/show_bug.cgi?id=112146
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1277]: https://gitlab.freedesktop.org/drm/intel/issues/1277
[i915#1316]: https://gitlab.freedesktop.org/drm/intel/issues/1316
[i915#1322]: https://gitlab.freedesktop.org/drm/intel/issues/1322
[i915#1389]: https://gitlab.freedesktop.org/drm/intel/issues/1389
[i915#1402]: https://gitlab.freedesktop.org/drm/intel/issues/1402
[i915#173]: https://gitlab.freedesktop.org/drm/intel/issues/173
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#413]: https://gitlab.freedesktop.org/drm/intel/issues/413
[i915#42]: https://gitlab.freedesktop.org/drm/intel/issues/42
[i915#44]: https://gitlab.freedesktop.org/drm/intel/issues/44
[i915#478]: https://gitlab.freedesktop.org/drm/intel/issues/478
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#56]: https://gitlab.freedesktop.org/drm/intel/issues/56
[i915#570]: https://gitlab.freedesktop.org/drm/intel/issues/570
[i915#644]: https://gitlab.freedesktop.org/drm/intel/issues/644
[i915#677]: https://gitlab.freedesktop.org/drm/intel/issues/677
[i915#679]: https://gitlab.freedesktop.org/drm/intel/issues/679
[i915#82]: https://gitlab.freedesktop.org/drm/intel/issues/82
[i915#899]: https://gitlab.freedesktop.org/drm/intel/issues/899
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (10 -> 8)
------------------------------
Missing (2): pig-skl-6260u pig-glk-j5005
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5504 -> IGTPW_4286
* Piglit: piglit_4509 -> None
CI-20190529: 20190529
CI_DRM_8106: 5b0076e8066ea8218e7857ee1aa28b0670acde94 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4286: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/index.html
IGT_5504: d6788bf0404f76b66170e18eb26c85004b5ccb25 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4286/index.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-03-10 21:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-10 16:29 [igt-dev] [PATCH i-g-t 1/2] lib/i915/perf: remove generation code for mathml render Lionel Landwerlin
2020-03-10 16:29 ` [igt-dev] [PATCH i-g-t 2/2] lib/i915/perf: break generated code in separate files Lionel Landwerlin
2020-03-10 16:31 ` Lionel Landwerlin
2020-03-10 16:40 ` [igt-dev] ✗ GitLab.Pipeline: warning for series starting with [i-g-t,1/2] lib/i915/perf: remove generation code for mathml render Patchwork
2020-03-10 17:00 ` [igt-dev] ✓ Fi.CI.BAT: success " Patchwork
2020-03-10 21:53 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.