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

i965: add a debug option to disable oa config loading

Browse Source 
This provides a good way to verify we haven't broken using the perf
driver on older kernels (which don't have the oa config loading
mechanism).

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Lionel Landwerlin
2017-08-29 10:41:27 +01:00
parent 27ee83eaf7
commit 349712018b
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/intel/common/gen_debug.c
View File

@@ -69,6 +69,7 @@ static const struct debug_control debug_control[] = {
{ "optimizer", DEBUG_OPTIMIZER }, { "optimizer", DEBUG_OPTIMIZER },
{ "ann", DEBUG_ANNOTATION }, { "ann", DEBUG_ANNOTATION },
{ "no8", DEBUG_NO8 }, { "no8", DEBUG_NO8 },
{ "no-oaconfig", DEBUG_NO_OACONFIG },
{ "spill_fs", DEBUG_SPILL_FS }, { "spill_fs", DEBUG_SPILL_FS },
{ "spill_vec4", DEBUG_SPILL_VEC4 }, { "spill_vec4", DEBUG_SPILL_VEC4 },
{ "cs", DEBUG_CS }, { "cs", DEBUG_CS },

2
src/intel/common/gen_debug.h
View File

@@ -69,7 +69,7 @@ extern uint64_t INTEL_DEBUG;
#define DEBUG_OPTIMIZER (1ull << 25) #define DEBUG_OPTIMIZER (1ull << 25)
#define DEBUG_ANNOTATION (1ull << 26) #define DEBUG_ANNOTATION (1ull << 26)
#define DEBUG_NO8 (1ull << 27) #define DEBUG_NO8 (1ull << 27)
/* Hole - feel free to reuse (1ull << 28) */ #define DEBUG_NO_OACONFIG (1ull << 28)
#define DEBUG_SPILL_FS (1ull << 29) #define DEBUG_SPILL_FS (1ull << 29)
#define DEBUG_SPILL_VEC4 (1ull << 30) #define DEBUG_SPILL_VEC4 (1ull << 30)
#define DEBUG_CS (1ull << 31) #define DEBUG_CS (1ull << 31)

3
src/mesa/drivers/dri/i965/brw_performance_query.c
View File

@@ -2144,7 +2144,8 @@ brw_init_perf_query_info(struct gl_context *ctx)
*/ */
oa_register(brw); oa_register(brw);
if (kernel_has_dynamic_config_support(brw, sysfs_dev_dir)) if (likely((INTEL_DEBUG & DEBUG_NO_OACONFIG) == 0) &&
kernel_has_dynamic_config_support(brw, sysfs_dev_dir))
init_oa_configs(brw, sysfs_dev_dir); init_oa_configs(brw, sysfs_dev_dir);
else else
enumerate_sysfs_metrics(brw, sysfs_dev_dir); enumerate_sysfs_metrics(brw, sysfs_dev_dir);