diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/Android.mk | 11 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/Makefile.am | 21 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/Makefile.sources | 40 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_oa.py | 433 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_performance_query.c | 13 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/meson.build | 37 |
6 files changed, 334 insertions, 221 deletions
diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk index 964313e6c5e..a3d010a5894 100644 --- a/src/mesa/drivers/dri/i965/Android.mk +++ b/src/mesa/drivers/dri/i965/Android.mk @@ -309,15 +309,18 @@ intermediates := $(call local-generated-sources-dir) LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ $(i965_oa_GENERATED_FILES)) -$(intermediates)/brw_oa_%.h: $(LOCAL_PATH)/brw_oa_%.xml $(LOCAL_PATH)/brw_oa.py +i965_oa_xml_FILES := $(addprefix $(LOCAL_PATH)/, \ + $(i965_oa_xml_FILES)) + +$(intermediates)/brw_oa_metrics.h: $(LOCAL_PATH)/brw_oa.py $(i965_oa_xml_FILES) @echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))" @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $(word 2, $^) --header=$@ --chipset=$(basename $*) $< + $(hide) $(MESA_PYTHON2) $< --header=$@ $(i965_oa_xml_FILES) -$(intermediates)/brw_oa_%.c: $(LOCAL_PATH)/brw_oa_%.xml $(LOCAL_PATH)/brw_oa.py +$(intermediates)/brw_oa_metrics.c: $(LOCAL_PATH)/brw_oa.py $(i965_oa_xml_FILES) @echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))" @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $(word 2, $^) --code=$@ --chipset=$(basename $*) $< + $(hide) $(MESA_PYTHON2) $< --code=$@ $(i965_oa_xml_FILES) include $(MESA_COMMON_MK) include $(BUILD_SHARED_LIBRARY) diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am index 824882389ea..8c8ecc6d76b 100644 --- a/src/mesa/drivers/dri/i965/Makefile.am +++ b/src/mesa/drivers/dri/i965/Makefile.am @@ -110,26 +110,15 @@ BUILT_SOURCES = $(i965_oa_GENERATED_FILES) CLEANFILES = $(BUILT_SOURCES) EXTRA_DIST = \ - brw_oa_hsw.xml \ - brw_oa_bdw.xml \ - brw_oa_chv.xml \ - brw_oa_sklgt2.xml \ - brw_oa_sklgt3.xml \ - brw_oa_sklgt4.xml \ - brw_oa_bxt.xml \ - brw_oa_kblgt2.xml \ - brw_oa_kblgt3.xml \ - brw_oa_glk.xml \ - brw_oa_cflgt2.xml \ - brw_oa_cflgt3.xml \ brw_oa.py \ + $(i965_oa_xml_FILES) \ meson.build # Note: we avoid using a multi target rule here and outputting both the # .c and .h files in one go so we don't hit problems with parallel # make and multiple invocations of the same script trying to write # to the same files. -brw_oa_%.h: brw_oa.py brw_oa_%.xml Makefile.am - $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/brw_oa.py --header=$(builddir)/brw_oa_$(*).h --chipset=$(*) $(srcdir)/brw_oa_$(*).xml -brw_oa_%.c: brw_oa.py brw_oa_%.xml Makefile.am - $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/brw_oa.py --code=$(builddir)/brw_oa_$(*).c --chipset=$(*) $(srcdir)/brw_oa_$(*).xml +brw_oa_metrics.h: brw_oa.py $(i965_oa_xml_FILES) + $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/brw_oa.py --header=$(builddir)/brw_oa_metrics.h $(i965_oa_xml_FILES) +brw_oa_metrics.c: brw_oa.py $(i965_oa_xml_FILES) + $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/brw_oa.py --code=$(builddir)/brw_oa_metrics.c $(i965_oa_xml_FILES) diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources index 2f349aa07ab..ad45cd84692 100644 --- a/src/mesa/drivers/dri/i965/Makefile.sources +++ b/src/mesa/drivers/dri/i965/Makefile.sources @@ -156,27 +156,19 @@ i965_gen11_FILES = \ genX_state_upload.c i965_oa_GENERATED_FILES = \ - brw_oa_hsw.h \ - brw_oa_hsw.c \ - brw_oa_bdw.h \ - brw_oa_bdw.c \ - brw_oa_chv.h \ - brw_oa_chv.c \ - brw_oa_sklgt2.h \ - brw_oa_sklgt2.c \ - brw_oa_sklgt3.h \ - brw_oa_sklgt3.c \ - brw_oa_sklgt4.h \ - brw_oa_sklgt4.c \ - brw_oa_bxt.h \ - brw_oa_bxt.c \ - brw_oa_kblgt2.h \ - brw_oa_kblgt2.c \ - brw_oa_kblgt3.h \ - brw_oa_kblgt3.c \ - brw_oa_glk.h \ - brw_oa_glk.c \ - brw_oa_cflgt2.h \ - brw_oa_cflgt2.c \ - brw_oa_cflgt3.h \ - brw_oa_cflgt3.c + brw_oa_metrics.c \ + brw_oa_metrics.h + +i965_oa_xml_FILES = \ + brw_oa_hsw.xml \ + brw_oa_bdw.xml \ + brw_oa_chv.xml \ + brw_oa_sklgt2.xml \ + brw_oa_sklgt3.xml \ + brw_oa_sklgt4.xml \ + brw_oa_bxt.xml \ + brw_oa_kblgt2.xml \ + brw_oa_kblgt3.xml \ + brw_oa_glk.xml \ + brw_oa_cflgt2.xml \ + brw_oa_cflgt3.xml diff --git a/src/mesa/drivers/dri/i965/brw_oa.py b/src/mesa/drivers/dri/i965/brw_oa.py index 7931c825f08..63db28bba97 100644 --- a/src/mesa/drivers/dri/i965/brw_oa.py +++ b/src/mesa/drivers/dri/i965/brw_oa.py @@ -26,8 +26,7 @@ import textwrap import xml.etree.cElementTree as et -max_values = {} -read_funcs = {} +hashed_funcs = {} c_file = None _c_indent = 0 @@ -177,7 +176,7 @@ hw_vars["$GpuMinFrequency"] = "brw->perfquery.sys_vars.gt_min_freq" hw_vars["$GpuMaxFrequency"] = "brw->perfquery.sys_vars.gt_max_freq" hw_vars["$SkuRevisionId"] = "brw->perfquery.sys_vars.revision" -def output_rpn_equation_code(set, counter, equation, counter_vars): +def output_rpn_equation_code(set, counter, equation): c("/* RPN equation: " + equation + " */") tokens = equation.split() stack = [] @@ -195,11 +194,11 @@ def output_rpn_equation_code(set, counter, equation, counter_vars): if operand[0] == "$": if operand in hw_vars: operand = hw_vars[operand] - elif operand in counter_vars: - reference = counter_vars[operand] - operand = read_funcs[operand[1:]] + "(brw, query, accumulator)" + elif operand in set.counter_vars: + reference = set.counter_vars[operand] + operand = set.read_funcs[operand[1:]] + "(brw, query, accumulator)" else: - raise Exception("Failed to resolve variable " + operand + " in equation " + equation + " for " + set.get('name') + " :: " + counter.get('name')); + raise Exception("Failed to resolve variable " + operand + " in equation " + equation + " for " + set.name + " :: " + counter.get('name')); args.append(operand) tmp_id = callback(tmp_id, args) @@ -208,7 +207,7 @@ def output_rpn_equation_code(set, counter, equation, counter_vars): stack.append(tmp) if len(stack) != 1: - raise Exception("Spurious empty rpn code for " + set.get('name') + " :: " + + raise Exception("Spurious empty rpn code for " + set.name + " :: " + counter.get('name') + ".\nThis is probably due to some unhandled RPN function, in the equation \"" + equation + "\"") @@ -216,8 +215,8 @@ def output_rpn_equation_code(set, counter, equation, counter_vars): if value in hw_vars: value = hw_vars[value] - if value in counter_vars: - value = read_funcs[value[1:]] + "(brw, query, accumulator)" + if value in set.counter_vars: + value = set.read_funcs[value[1:]] + "(brw, query, accumulator)" c("\nreturn " + value + ";") @@ -237,7 +236,7 @@ def splice_rpn_expression(set, counter, expression): if operand in hw_vars: operand = hw_vars[operand] else: - raise Exception("Failed to resolve variable " + operand + " in expression " + expression + " for " + set.get('name') + " :: " + counter.get('name')); + raise Exception("Failed to resolve variable " + operand + " in expression " + expression + " for " + set.name + " :: " + counter.get('name')); args.append(operand) subexp = callback(args) @@ -245,73 +244,73 @@ def splice_rpn_expression(set, counter, expression): stack.append(subexp) if len(stack) != 1: - raise Exception("Spurious empty rpn expression for " + set.get('name') + " :: " + + raise Exception("Spurious empty rpn expression for " + set.name + " :: " + counter.get('name') + ".\nThis is probably due to some unhandled RPN operation, in the expression \"" + expression + "\"") return stack[-1] -def output_counter_read(set, counter, counter_vars): +def output_counter_read(gen, set, counter): c("\n") - c("/* {0} :: {1} */".format(set.get('name'), counter.get('name'))) - ret_type = counter.get('data_type') - if ret_type == "uint64": - ret_type = "uint64_t" + c("/* {0} :: {1} */".format(set.name, counter.get('name'))) - c("static " + ret_type) - read_sym = "{0}__{1}__{2}__read".format(set.get('chipset').lower(), set.get('underscore_name'), counter.get('underscore_name')) - c(read_sym + "(MAYBE_UNUSED struct brw_context *brw,\n") - c_indent(len(read_sym) + 1) - c("const struct brw_perf_query_info *query,\n") - c("uint64_t *accumulator)\n") - c_outdent(len(read_sym) + 1) - - c("{") - c_indent(3) + if counter.read_hash in hashed_funcs: + c("#define %s \\" % counter.read_sym) + c_indent(3) + c("%s" % hashed_funcs[counter.read_hash]) + c_outdent(3) + else: + ret_type = counter.get('data_type') + if ret_type == "uint64": + ret_type = "uint64_t" - output_rpn_equation_code(set, counter, counter.get('equation'), counter_vars) + read_eq = counter.get('equation') - c_outdent(3) - c("}") + c("static " + ret_type) + c(counter.read_sym + "(MAYBE_UNUSED struct brw_context *brw,\n") + c_indent(len(counter.read_sym) + 1) + c("const struct brw_perf_query_info *query,\n") + c("uint64_t *accumulator)\n") + c_outdent(len(counter.read_sym) + 1) - return read_sym + c("{") + c_indent(3) + output_rpn_equation_code(set, counter, read_eq) + c_outdent(3) + c("}") -def output_counter_max(set, counter, counter_vars): - max_eq = counter.get('max_equation') + hashed_funcs[counter.read_hash] = counter.read_sym - if not max_eq: - return "0; /* undefined */" - try: - val = float(max_eq) - return max_eq + ";" - except ValueError: - pass +def output_counter_max(gen, set, counter): + max_eq = counter.get('max_equation') - # We can only report constant maximum values via INTEL_performance_query - for token in max_eq.split(): - if token[0] == '$' and token not in hw_vars: - return "0; /* unsupported (varies over time) */" + if not counter.has_max_func(): + return c("\n") - c("/* {0} :: {1} */".format(set.get('name'), counter.get('name'))) - ret_type = counter.get('data_type') - if ret_type == "uint64": - ret_type = "uint64_t" + c("/* {0} :: {1} */".format(set.name, counter.get('name'))) - c("static " + ret_type) - max_sym = "{0}__{1}__{2}__max".format(set.get('chipset').lower(), set.get('underscore_name'), counter.get('underscore_name')) - c(max_sym + "(struct brw_context *brw)\n") - - c("{") - c_indent(3) + if counter.max_hash in hashed_funcs: + c("#define %s \\" % counter.max_sym()) + c_indent(3) + c("%s" % hashed_funcs[counter.max_hash]) + c_outdent(3) + else: + ret_type = counter.get('data_type') + if ret_type == "uint64": + ret_type = "uint64_t" - output_rpn_equation_code(set, counter, max_eq, counter_vars) + c("static " + ret_type) + c(counter.max_sym() + "(struct brw_context *brw)\n") + c("{") + c_indent(3) + output_rpn_equation_code(set, counter, max_eq) + c_outdent(3) + c("}") - c_outdent(3) - c("}") + hashed_funcs[counter.max_hash] = counter.max_sym() - return max_sym + "(brw);" c_type_sizes = { "uint32_t": 4, "uint64_t": 8, "float": 4, "double": 8, "bool": 4 } def sizeof(c_type): @@ -362,12 +361,12 @@ def output_counter_report(set, counter, current_offset): c_indent(3) c("counter = &query->counters[query->n_counters++];\n") - c("counter->oa_counter_read_" + data_type + " = " + read_funcs[counter.get('symbol_name')] + ";\n") + c("counter->oa_counter_read_" + data_type + " = " + set.read_funcs[counter.get('symbol_name')] + ";\n") c("counter->name = \"" + counter.get('name') + "\";\n") c("counter->desc = \"" + counter.get('description') + "\";\n") c("counter->type = GL_PERFQUERY_COUNTER_" + semantic_type_uc + "_INTEL;\n") c("counter->data_type = GL_PERFQUERY_COUNTER_DATA_" + data_type_uc + "_INTEL;\n") - c("counter->raw_max = " + max_values[counter.get('symbol_name')] + "\n") + c("counter->raw_max = " + set.max_values[counter.get('symbol_name')] + ";\n") current_offset = pot_align(current_offset, sizeof(c_type)) c("counter->offset = " + str(current_offset) + ";\n") @@ -419,29 +418,159 @@ def generate_register_configs(set): c("\n") +# Wraps a <counter> element from the brw_oa_*.xml files. +class Counter: + def __init__(self, set, xml): + self.xml = xml + self.set = set + self.read_hash = None + self.max_hash = None + + self.read_sym = "{0}__{1}__{2}__read".format(self.set.gen.chipset, + self.set.underscore_name, + self.xml.get('underscore_name')) + + def get(self, prop): + return self.xml.get(prop) + + # Compute the hash of a counter's equation by expanding (including all the + # sub-equations it depends on) + def compute_hashes(self): + if self.read_hash is not None: + return + + def replace_token(token): + if token[0] != "$": + return token + if token not in self.set.counter_vars: + return token + self.set.counter_vars[token].compute_hashes() + return self.set.counter_vars[token].read_hash + + read_eq = self.xml.get('equation') + self.read_hash = ' '.join(map(replace_token, read_eq.split())) + + max_eq = self.xml.get('max_equation') + if max_eq: + self.max_hash = ' '.join(map(replace_token, max_eq.split())) + + def has_max_func(self): + max_eq = self.xml.get('max_equation') + if not max_eq: + return False + + try: + val = float(max_eq) + return False + except ValueError: + pass + + for token in max_eq.split(): + if token[0] == '$' and token not in hw_vars: + return False + return True + + def max_sym(self): + assert self.has_max_func() + return "{0}__{1}__{2}__max".format(self.set.gen.chipset, + self.set.underscore_name, + self.xml.get('underscore_name')) + + def max_value(self): + max_eq = self.xml.get('max_equation') + if not max_eq: + return "0 /* undefined */" + + try: + return "{0}".format(float(max_eq)) + except ValueError: + pass + + for token in max_eq.split(): + if token[0] == '$' and token not in hw_vars: + return "0 /* unsupported (varies over time) */" + + return "{0}__{1}__{2}__max(brw)".format(self.set.gen.chipset, + self.set.underscore_name, + self.xml.get('underscore_name')) + +# Wraps a <set> element from the brw_oa_*.xml files. +class Set: + def __init__(self, gen, xml): + self.gen = gen + self.xml = xml + + self.counter_vars = {} + self.max_values = {} + self.read_funcs = {} + + xml_counters = self.xml.findall("counter") + self.counters = [] + for xml_counter in xml_counters: + counter = Counter(self, xml_counter) + self.counters.append(counter) + self.counter_vars["$" + counter.get('symbol_name')] = counter + self.read_funcs[counter.get('symbol_name')] = counter.read_sym + self.max_values[counter.get('symbol_name')] = counter.max_value() + + for counter in self.counters: + counter.compute_hashes() + + @property + def hw_config_guid(self): + return self.xml.get('hw_config_guid') + + @property + def name(self): + return self.xml.get('name') + + @property + def symbol_name(self): + return self.xml.get('symbol_name') + + @property + def underscore_name(self): + return self.xml.get('underscore_name') + + def findall(self, path): + return self.xml.findall(path) + + def find(self, path): + return self.xml.find(path) + + +# Wraps an entire brw_oa_*.xml file. +class Gen: + def __init__(self, filename): + self.filename = filename + self.xml = et.parse(self.filename) + self.chipset = self.xml.find('.//set').get('chipset').lower() + self.sets = [] + + for xml_set in self.xml.findall(".//set"): + self.sets.append(Set(self, xml_set)) + + def main(): global c_file global header_file - global max_values - global read_funcs parser = argparse.ArgumentParser() - parser.add_argument("xml", help="XML description of metrics") parser.add_argument("--header", help="Header file to write") parser.add_argument("--code", help="C file to write") - parser.add_argument("--chipset", help="Chipset to generate code for", required=True) + parser.add_argument("xml_files", nargs='+', help="List of xml metrics files to process") args = parser.parse_args() - chipset = args.chipset.lower() - if args.header: header_file = open(args.header, 'w') if args.code: c_file = open(args.code, 'w') - tree = et.parse(args.xml) + gens = [] + for xml_file in args.xml_files: + gens.append(Gen(xml_file)) copyright = textwrap.dedent("""\ @@ -488,7 +617,7 @@ def main(): """)) - c("#include \"brw_oa_" + chipset + ".h\"") + c("#include \"" + os.path.basename(args.header) + "\"") c(textwrap.dedent("""\ #include "brw_context.h" @@ -498,114 +627,114 @@ def main(): #define MIN(a, b) ((a < b) ? (a) : (b)) #define MAX(a, b) ((a > b) ? (a) : (b)) - """)) - - for set in tree.findall(".//set"): - max_values = {} - read_funcs = {} - counter_vars = {} - counters = set.findall("counter") - assert set.get('chipset').lower() == chipset - - for counter in counters: - empty_vars = {} - read_funcs[counter.get('symbol_name')] = output_counter_read(set, counter, counter_vars) - max_values[counter.get('symbol_name')] = output_counter_max(set, counter, empty_vars) - counter_vars["$" + counter.get('symbol_name')] = counter + """)) - c("\n") - register_lengths = compute_register_lengths(set); - for reg_type, reg_length in register_lengths.iteritems(): - c("static struct brw_perf_query_register_prog {0}_{1}_{2}[{3}];".format(chipset, - set.get('underscore_name'), - reg_type, reg_length)) - - c("\nstatic struct brw_perf_query_counter {0}_{1}_query_counters[{2}];\n".format(chipset, set.get('underscore_name'), len(counters))) - c("static struct brw_perf_query_info " + chipset + "_" + set.get('underscore_name') + "_query = {\n") - c_indent(3) + # Print out all equation functions. + for gen in gens: + for set in gen.sets: + for counter in set.counters: + output_counter_read(gen, set, counter) + output_counter_max(gen, set, counter) + + # Print out all metric sets registration functions for each set in each + # generation. + for gen in gens: + for set in gen.sets: + counters = set.counters + + c("\n") + register_lengths = compute_register_lengths(set); + for reg_type, reg_length in register_lengths.iteritems(): + c("static struct brw_perf_query_register_prog {0}_{1}_{2}[{3}];".format(gen.chipset, + set.underscore_name, + reg_type, reg_length)) + + c("\nstatic struct brw_perf_query_counter {0}_{1}_query_counters[{2}];\n".format(gen.chipset, set.underscore_name, len(counters))) + c("static struct brw_perf_query_info " + gen.chipset + "_" + set.underscore_name + "_query = {\n") + c_indent(3) - c(".kind = OA_COUNTERS,\n") - c(".name = \"" + set.get('name') + "\",\n") - c(".guid = \"" + set.get('hw_config_guid') + "\",\n") + c(".kind = OA_COUNTERS,\n") + c(".name = \"" + set.name + "\",\n") + c(".guid = \"" + set.hw_config_guid + "\",\n") - c(".counters = {0}_{1}_query_counters,".format(chipset, set.get('underscore_name'))) - c(".n_counters = 0,") - c(".oa_metrics_set_id = 0, /* determined at runtime, via sysfs */") + c(".counters = {0}_{1}_query_counters,".format(gen.chipset, set.underscore_name)) + c(".n_counters = 0,") + c(".oa_metrics_set_id = 0, /* determined at runtime, via sysfs */") - if chipset == "hsw": - c(textwrap.dedent("""\ - .oa_format = I915_OA_FORMAT_A45_B8_C8, + if gen.chipset == "hsw": + c(textwrap.dedent("""\ + .oa_format = I915_OA_FORMAT_A45_B8_C8, - /* Accumulation buffer offsets... */ - .gpu_time_offset = 0, - .a_offset = 1, - .b_offset = 46, - .c_offset = 54, + /* Accumulation buffer offsets... */ + .gpu_time_offset = 0, + .a_offset = 1, + .b_offset = 46, + .c_offset = 54, """)) - else: - c(textwrap.dedent("""\ - .oa_format = I915_OA_FORMAT_A32u40_A4u32_B8_C8, - - /* Accumulation buffer offsets... */ - .gpu_time_offset = 0, - .gpu_clock_offset = 1, - .a_offset = 2, - .b_offset = 38, - .c_offset = 46, + else: + c(textwrap.dedent("""\ + .oa_format = I915_OA_FORMAT_A32u40_A4u32_B8_C8, + + /* Accumulation buffer offsets... */ + .gpu_time_offset = 0, + .gpu_clock_offset = 1, + .a_offset = 2, + .b_offset = 38, + .c_offset = 46, """)) - for reg_type, reg_length in register_lengths.iteritems(): - c(".{0} = {1}_{2}_{3},".format(reg_type, chipset, set.get('underscore_name'), reg_type)) - c(".n_{0} = 0, /* Determined at runtime */".format(reg_type)) + for reg_type, reg_length in register_lengths.iteritems(): + c(".{0} = {1}_{2}_{3},".format(reg_type, gen.chipset, set.underscore_name, reg_type)) + c(".n_{0} = 0, /* Determined at runtime */".format(reg_type)) - c_outdent(3) - c("};\n") + c_outdent(3) + c("};\n") - c("\nstatic void\n") - c("register_" + set.get('underscore_name') + "_counter_query(struct brw_context *brw)\n") - c("{\n") - c_indent(3) + c("\nstatic void\n") + c("{0}_register_{1}_counter_query(struct brw_context *brw)\n".format(gen.chipset, set.underscore_name)) + c("{\n") + c_indent(3) - c("static struct brw_perf_query_info *query = &" + chipset + "_" + set.get('underscore_name') + "_query;\n") - c("struct brw_perf_query_counter *counter;\n") + c("static struct brw_perf_query_info *query = &" + gen.chipset + "_" + set.underscore_name + "_query;\n") + c("struct brw_perf_query_counter *counter;\n") - c("\n") - c("/* Note: we're assuming there can't be any variation in the definition ") - c(" * of a query between contexts so it's ok to describe a query within a ") - c(" * global variable which only needs to be initialized once... */") - c("\nif (!query->data_size) {") - c_indent(3) + c("\n") + c("/* Note: we're assuming there can't be any variation in the definition ") + c(" * of a query between contexts so it's ok to describe a query within a ") + c(" * global variable which only needs to be initialized once... */") + c("\nif (!query->data_size) {") + c_indent(3) - generate_register_configs(set) + generate_register_configs(set) - offset = 0 - for counter in counters: - offset = output_counter_report(set, counter, offset) + offset = 0 + for counter in counters: + offset = output_counter_report(set, counter, offset) - c("\nquery->data_size = counter->offset + counter->size;\n") + c("\nquery->data_size = counter->offset + counter->size;\n") - c_outdent(3) - c("}"); + c_outdent(3) + c("}"); - c("\n_mesa_hash_table_insert(brw->perfquery.oa_metrics_table, query->guid, query);") + c("\n_mesa_hash_table_insert(brw->perfquery.oa_metrics_table, query->guid, query);") - c_outdent(3) - c("}\n") + c_outdent(3) + c("}\n") - h("void brw_oa_register_queries_" + chipset + "(struct brw_context *brw);\n") + h("void brw_oa_register_queries_" + gen.chipset + "(struct brw_context *brw);\n") - c("\nvoid") - c("brw_oa_register_queries_" + chipset + "(struct brw_context *brw)") - c("{") - c_indent(3) + c("\nvoid") + c("brw_oa_register_queries_" + gen.chipset + "(struct brw_context *brw)") + c("{") + c_indent(3) - for set in tree.findall(".//set"): - c("register_" + set.get('underscore_name') + "_counter_query(brw);") + for set in gen.sets: + c("{0}_register_{1}_counter_query(brw);".format(gen.chipset, set.underscore_name)) - c_outdent(3) - c("}") + c_outdent(3) + c("}") if __name__ == '__main__': diff --git a/src/mesa/drivers/dri/i965/brw_performance_query.c b/src/mesa/drivers/dri/i965/brw_performance_query.c index 13eff31ee61..0d0fb94537f 100644 --- a/src/mesa/drivers/dri/i965/brw_performance_query.c +++ b/src/mesa/drivers/dri/i965/brw_performance_query.c @@ -71,18 +71,7 @@ #include "brw_context.h" #include "brw_defines.h" #include "brw_performance_query.h" -#include "brw_oa_hsw.h" -#include "brw_oa_bdw.h" -#include "brw_oa_chv.h" -#include "brw_oa_sklgt2.h" -#include "brw_oa_sklgt3.h" -#include "brw_oa_sklgt4.h" -#include "brw_oa_bxt.h" -#include "brw_oa_kblgt2.h" -#include "brw_oa_kblgt3.h" -#include "brw_oa_glk.h" -#include "brw_oa_cflgt2.h" -#include "brw_oa_cflgt3.h" +#include "brw_oa_metrics.h" #include "intel_batchbuffer.h" #define FILE_DEBUG_FLAG DEBUG_PERFMON diff --git a/src/mesa/drivers/dri/i965/meson.build b/src/mesa/drivers/dri/i965/meson.build index b0bf40351da..cfa27f31bf8 100644 --- a/src/mesa/drivers/dri/i965/meson.build +++ b/src/mesa/drivers/dri/i965/meson.build @@ -149,21 +149,32 @@ foreach v : ['40', '45', '50', '60', '70', '75', '80', '90', '100', '110'] ) endforeach -i965_oa_sources = [] -foreach hw : ['hsw', 'bdw', 'chv', 'sklgt2', 'sklgt3', 'sklgt4', 'bxt', - 'kblgt2', 'kblgt3', 'glk', 'cflgt2', 'cflgt3'] - _name = 'brw_oa_@0@'.format(hw) - i965_oa_sources += custom_target( - _name, - input : ['brw_oa.py', '@[email protected]'.format(_name)], - output : ['@[email protected]'.format(_name), '@[email protected]'.format(_name)], - command : [ - prog_python2, '@INPUT0@', '--chipset', hw, '--code', '@OUTPUT0@', - '--header', '@OUTPUT1@', '@INPUT1@', - ], - ) + +i965_hw_metrics = [ + 'hsw', + 'bdw', 'chv', + 'sklgt2', 'sklgt3', 'sklgt4', + 'kblgt2', 'kblgt3', + 'cflgt2', 'cflgt3', + 'bxt', 'glk', +] + +i965_hw_metrics_xml_files = [] +foreach hw : i965_hw_metrics + i965_hw_metrics_xml_files += 'brw_oa_@[email protected]'.format(hw) endforeach +i965_oa_sources = custom_target( + 'i965-oa-sources', + input : i965_hw_metrics_xml_files, + output : [ 'brw_oa_metrics.c', 'brw_oa_metrics.h' ], + command : [ + prog_python2, files('brw_oa.py'), + '--code', '@OUTPUT0@', '--header', '@OUTPUT1@', + '@INPUT@', + ], +) + libi965 = static_library( 'i965', [files_i965, i965_oa_sources, ir_expression_operation_h, |