From 290f5a0156e330c34bc11341f4e568cf3f79ee5b Mon Sep 17 00:00:00 2001
From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Fri, 21 May 2021 18:35:07 +0300
Subject: [PATCH] intel/perf: add EHL availability condition to HDCAndSF
 counters

The availability of those counters depends on the topology.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10930>
---
 src/intel/perf/oa-ehl.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/intel/perf/oa-ehl.xml b/src/intel/perf/oa-ehl.xml
index d32e04492fc..4a6af977c3e 100644
--- a/src/intel/perf/oa-ehl.xml
+++ b/src/intel/perf/oa-ehl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1609843424" merge_md5="">
+<metrics version="1609843831" merge_md5="">
   <set name="Render Metrics Basic Gen11"
        chipset="EHL"
        symbol_name="RenderBasic"
@@ -3825,6 +3825,7 @@
              units="percent"
              semantic_type="duration"
              equation="C 0 READ B 7 READ FSUB 100 UMUL $GpuCoreClocks FDIV"
+             availability="$SubsliceMask 3 AND"
              mdapi_group="GPU/Data Port"
              mdapi_usage_flags="Tier3 Frame Batch Draw"
              mdapi_supported_apis=""
@@ -3839,6 +3840,7 @@
              units="percent"
              semantic_type="duration"
              equation="C 2 READ C 1 READ FSUB 100 UMUL $GpuCoreClocks FDIV"
+             availability="$SubsliceMask 12 AND"
              mdapi_group="GPU/Data Port"
              mdapi_usage_flags="Tier3 Frame Batch Draw"
              mdapi_supported_apis=""
@@ -3853,6 +3855,7 @@
              units="percent"
              semantic_type="duration"
              equation="C 4 READ C 3 READ FSUB 100 UMUL $GpuCoreClocks FDIV"
+             availability="$SubsliceMask 48 AND"
              mdapi_group="GPU/Data Port"
              mdapi_usage_flags="Tier3 Frame Batch Draw"
              mdapi_supported_apis=""
@@ -3867,6 +3870,7 @@
              units="percent"
              semantic_type="duration"
              equation="C 6 READ C 5 READ FSUB 100 UMUL $GpuCoreClocks FDIV"
+             availability="$SubsliceMask 192 AND"
              mdapi_group="GPU/Data Port"
              mdapi_usage_flags="Tier3 Frame Batch Draw"
              mdapi_supported_apis=""