OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/perf: extract register configuration

Browse Source 
We want to query the content of register configurations from the
kernel. Let's pull this out of the query.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Rafael Antognolli <rafael.antognolli@intel.com>
This commit is contained in:
Lionel Landwerlin
2018-10-19 18:25:13 +01:00
parent a338b7d739
commit e1d5d75257
3 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/intel/perf/gen_perf.c
View File

@@ -616,14 +616,14 @@ init_oa_configs(struct gen_perf_config *perf, int fd)
memcpy(config.uuid, query->guid, sizeof(config.uuid)); memcpy(config.uuid, query->guid, sizeof(config.uuid));
config.n_mux_regs = query->n_mux_regs; config.n_mux_regs = query->config.n_mux_regs;
config.mux_regs_ptr = (uintptr_t) query->mux_regs; config.mux_regs_ptr = (uintptr_t) query->config.mux_regs;
config.n_boolean_regs = query->n_b_counter_regs; config.n_boolean_regs = query->config.n_b_counter_regs;
config.boolean_regs_ptr = (uintptr_t) query->b_counter_regs; config.boolean_regs_ptr = (uintptr_t) query->config.b_counter_regs;
config.n_flex_regs = query->n_flex_regs; config.n_flex_regs = query->config.n_flex_regs;
config.flex_regs_ptr = (uintptr_t) query->flex_regs; config.flex_regs_ptr = (uintptr_t) query->config.flex_regs;
ret = gen_ioctl(fd, DRM_IOCTL_I915_PERF_ADD_CONFIG, &config); ret = gen_ioctl(fd, DRM_IOCTL_I915_PERF_ADD_CONFIG, &config);
if (ret < 0) { if (ret < 0) {

22
src/intel/perf/gen_perf.h
View File

@@ -164,6 +164,18 @@ struct gen_perf_query_register_prog {
uint32_t val; uint32_t val;
}; };
/* Register programming for a given query */
struct gen_perf_configuration {
struct gen_perf_query_register_prog *flex_regs;
uint32_t n_flex_regs;
struct gen_perf_query_register_prog *mux_regs;
uint32_t n_mux_regs;
struct gen_perf_query_register_prog *b_counter_regs;
uint32_t n_b_counter_regs;
};
struct gen_perf_query_info { struct gen_perf_query_info {
enum gen_perf_query_type { enum gen_perf_query_type {
GEN_PERF_QUERY_TYPE_OA, GEN_PERF_QUERY_TYPE_OA,
@@ -188,15 +200,7 @@ struct gen_perf_query_info {
int b_offset; int b_offset;
int c_offset; int c_offset;
/* Register programming for a given query */ struct gen_perf_configuration config;
struct gen_perf_query_register_prog *flex_regs;
uint32_t n_flex_regs;
struct gen_perf_query_register_prog *mux_regs;
uint32_t n_mux_regs;
struct gen_perf_query_register_prog *b_counter_regs;
uint32_t n_b_counter_regs;
}; };
struct gen_perf_config { struct gen_perf_config {

6
src/intel/perf/gen_perf.py
View File

@@ -419,7 +419,7 @@ def generate_register_configs(set):
c_indent(3) c_indent(3)
for register in register_config.findall('register'): for register in register_config.findall('register'):
c("query->%s[query->n_%s++] = (struct gen_perf_query_register_prog) { .reg = %s, .val = %s };" % c("query->config.%s[query->config.n_%s++] = (struct gen_perf_query_register_prog) { .reg = %s, .val = %s };" %
(t, t, register.get('address'), register.get('value'))) (t, t, register.get('address'), register.get('value')))
if availability: if availability:
@@ -692,9 +692,13 @@ def main():
.c_offset = 46, .c_offset = 46,
""")) """))
c(".config = {")
c_indent(3)
for reg_type, reg_length in register_lengths.items(): for reg_type, reg_length in register_lengths.items():
c(".{0} = {1}_{2}_{3},".format(reg_type, gen.chipset, set.underscore_name, reg_type)) 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(".n_{0} = 0, /* Determined at runtime */".format(reg_type))
c_outdent(3)
c("},")
c_outdent(3) c_outdent(3)
c("};\n") c("};\n")