Module: Mesa Branch: master Commit: f4b1ec297298f1e638010c2fdd8432e6105e9fab URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f4b1ec297298f1e638010c2fdd8432e6105e9fab
Author: Dave Airlie <[email protected]> Date: Wed Dec 6 23:41:35 2017 +0000 r600: drop l2 related queries radeonsi only. Signed-off-by: Dave Airlie <[email protected]> --- src/gallium/drivers/r600/r600_pipe_common.h | 2 -- src/gallium/drivers/r600/r600_query.c | 14 -------------- src/gallium/drivers/r600/r600_query.h | 2 -- 3 files changed, 18 deletions(-) diff --git a/src/gallium/drivers/r600/r600_pipe_common.h b/src/gallium/drivers/r600/r600_pipe_common.h index c8b971a5e4..1fdbc39a56 100644 --- a/src/gallium/drivers/r600/r600_pipe_common.h +++ b/src/gallium/drivers/r600/r600_pipe_common.h @@ -564,8 +564,6 @@ struct r600_common_context { unsigned num_cs_flushes; unsigned num_cb_cache_flushes; unsigned num_db_cache_flushes; - unsigned num_L2_invalidates; - unsigned num_L2_writebacks; unsigned num_resident_handles; uint64_t num_alloc_tex_transfer_bytes; diff --git a/src/gallium/drivers/r600/r600_query.c b/src/gallium/drivers/r600/r600_query.c index 987da9a806..0d22bc5216 100644 --- a/src/gallium/drivers/r600/r600_query.c +++ b/src/gallium/drivers/r600/r600_query.c @@ -141,12 +141,6 @@ static bool r600_query_sw_begin(struct r600_common_context *rctx, case R600_QUERY_NUM_DB_CACHE_FLUSHES: query->begin_result = rctx->num_db_cache_flushes; break; - case R600_QUERY_NUM_L2_INVALIDATES: - query->begin_result = rctx->num_L2_invalidates; - break; - case R600_QUERY_NUM_L2_WRITEBACKS: - query->begin_result = rctx->num_L2_writebacks; - break; case R600_QUERY_NUM_RESIDENT_HANDLES: query->begin_result = rctx->num_resident_handles; break; @@ -299,12 +293,6 @@ static bool r600_query_sw_end(struct r600_common_context *rctx, case R600_QUERY_NUM_DB_CACHE_FLUSHES: query->end_result = rctx->num_db_cache_flushes; break; - case R600_QUERY_NUM_L2_INVALIDATES: - query->end_result = rctx->num_L2_invalidates; - break; - case R600_QUERY_NUM_L2_WRITEBACKS: - query->end_result = rctx->num_L2_writebacks; - break; case R600_QUERY_NUM_RESIDENT_HANDLES: query->end_result = rctx->num_resident_handles; break; @@ -1932,8 +1920,6 @@ static struct pipe_driver_query_info r600_driver_query_list[] = { X("num-cs-flushes", NUM_CS_FLUSHES, UINT64, AVERAGE), X("num-CB-cache-flushes", NUM_CB_CACHE_FLUSHES, UINT64, AVERAGE), X("num-DB-cache-flushes", NUM_DB_CACHE_FLUSHES, UINT64, AVERAGE), - X("num-L2-invalidates", NUM_L2_INVALIDATES, UINT64, AVERAGE), - X("num-L2-writebacks", NUM_L2_WRITEBACKS, UINT64, AVERAGE), X("num-resident-handles", NUM_RESIDENT_HANDLES, UINT64, AVERAGE), X("tc-offloaded-slots", TC_OFFLOADED_SLOTS, UINT64, AVERAGE), X("tc-direct-slots", TC_DIRECT_SLOTS, UINT64, AVERAGE), diff --git a/src/gallium/drivers/r600/r600_query.h b/src/gallium/drivers/r600/r600_query.h index acba1a6540..20647ff98d 100644 --- a/src/gallium/drivers/r600/r600_query.h +++ b/src/gallium/drivers/r600/r600_query.h @@ -55,8 +55,6 @@ enum { R600_QUERY_NUM_CS_FLUSHES, R600_QUERY_NUM_CB_CACHE_FLUSHES, R600_QUERY_NUM_DB_CACHE_FLUSHES, - R600_QUERY_NUM_L2_INVALIDATES, - R600_QUERY_NUM_L2_WRITEBACKS, R600_QUERY_NUM_RESIDENT_HANDLES, R600_QUERY_TC_OFFLOADED_SLOTS, R600_QUERY_TC_DIRECT_SLOTS, _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
