projects / platform / upstream / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f721f2a)
intel/perf: drop the special READ_REG operator
authorLionel Landwerlin <lionel.g.landwerlin@intel.com>
Thu, 8 Oct 2020 12:15:51 +0000 (15:15 +0300)
committerMarge Bot <eric+marge@anholt.net>
Tue, 2 Feb 2021 13:25:55 +0000 (13:25 +0000)
Makes things a bit more uniform.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Marcin Ślusarz <marcin.slusarz@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6518>

13 files changed:
src/intel/perf/gen_perf.py patch | blob | history
src/intel/perf/oa-bdw.xml patch | blob | history
src/intel/perf/oa-bxt.xml patch | blob | history
src/intel/perf/oa-cflgt2.xml patch | blob | history
src/intel/perf/oa-cflgt3.xml patch | blob | history
src/intel/perf/oa-chv.xml patch | blob | history
src/intel/perf/oa-glk.xml patch | blob | history
src/intel/perf/oa-hsw.xml patch | blob | history
src/intel/perf/oa-kblgt2.xml patch | blob | history
src/intel/perf/oa-kblgt3.xml patch | blob | history
src/intel/perf/oa-sklgt2.xml patch | blob | history
src/intel/perf/oa-sklgt3.xml patch | blob | history
src/intel/perf/oa-sklgt4.xml patch | blob | history

diff --git a/src/intel/perf/gen_perf.py b/src/intel/perf/gen_perf.py
index 6fc2360..629fdc4 100644 (file)
--- a/src/intel/perf/gen_perf.py
+++ b/src/intel/perf/gen_perf.py
@@ -97,14 +97,6 @@ def emit_read(tmp_id, args):
     c("uint64_t tmp{0} = results->accumulator[query->{1}_offset + {2}];".format(tmp_id, type, args[0]))
     return tmp_id + 1
 
-def emit_read_reg(tmp_id, args):
-    offsets = {
-        'PERFCNT1': 0,
-        'PERFCNT2': 1,
-    }
-    c("uint64_t tmp{0} = results->accumulator[query->perfcnt_offset + {1}];".format(tmp_id, offsets[args[0]]))
-    return tmp_id + 1
-
 def emit_uadd(tmp_id, args):
     c("uint64_t tmp{0} = {1} + {2};".format(tmp_id, args[1], args[0]))
     return tmp_id + 1
@@ -152,7 +144,6 @@ ops["FMAX"] = (2, emit_fmax)
 ops["FMUL"] = (2, emit_fmul)
 ops["FSUB"] = (2, emit_fsub)
 ops["READ"] = (2, emit_read)
-ops["READ_REG"] = (1, emit_read_reg)
 ops["UADD"] = (2, emit_uadd)
 ops["UDIV"] = (2, emit_udiv)
 ops["UMUL"] = (2, emit_umul)
diff --git a/src/intel/perf/oa-bdw.xml b/src/intel/perf/oa-bdw.xml
index 85bbc67..8581330 100644 (file)
--- a/src/intel/perf/oa-bdw.xml
+++ b/src/intel/perf/oa-bdw.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1582124704" merge_md5="">
+<metrics version="1599482526" merge_md5="">
   <set name="Render Metrics Basic Gen8"
        chipset="BDW"
        symbol_name="RenderBasic"
@@ -7800,7 +7800,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -8474,7 +8474,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -9155,7 +9155,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -9823,7 +9823,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -10507,7 +10507,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -11280,7 +11280,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -12010,7 +12010,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -12746,7 +12746,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -13560,7 +13560,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -14417,7 +14417,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
diff --git a/src/intel/perf/oa-bxt.xml b/src/intel/perf/oa-bxt.xml
index 7bf8f09..891cbf2 100644 (file)
--- a/src/intel/perf/oa-bxt.xml
+++ b/src/intel/perf/oa-bxt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1598356968" merge_md5="">
+<metrics version="1599482527" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        chipset="BXT"
        symbol_name="RenderBasic"
@@ -5457,7 +5457,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -6075,7 +6075,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -6843,7 +6843,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -7492,7 +7492,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -8195,7 +8195,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -8897,7 +8897,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
diff --git a/src/intel/perf/oa-cflgt2.xml b/src/intel/perf/oa-cflgt2.xml
index 1c021cd..d568b91 100644 (file)
--- a/src/intel/perf/oa-cflgt2.xml
+++ b/src/intel/perf/oa-cflgt2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1598356968" merge_md5="">
+<metrics version="1599482527" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        chipset="CFLGT2"
        symbol_name="RenderBasic"
@@ -5462,7 +5462,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -6092,7 +6092,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -6723,7 +6723,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -7319,7 +7319,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -7959,7 +7959,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -8598,7 +8598,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -9277,7 +9277,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -9961,7 +9961,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
diff --git a/src/intel/perf/oa-cflgt3.xml b/src/intel/perf/oa-cflgt3.xml
index 9439698..9ac9156 100644 (file)
--- a/src/intel/perf/oa-cflgt3.xml
+++ b/src/intel/perf/oa-cflgt3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1598356968" merge_md5="">
+<metrics version="1599482527" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        chipset="CFLGT3"
        symbol_name="RenderBasic"
@@ -5475,7 +5475,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -6106,7 +6106,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -6737,7 +6737,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -7333,7 +7333,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -7973,7 +7973,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -8612,7 +8612,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -9291,7 +9291,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -9975,7 +9975,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
diff --git a/src/intel/perf/oa-chv.xml b/src/intel/perf/oa-chv.xml
index 2f13447..5d61277 100644 (file)
--- a/src/intel/perf/oa-chv.xml
+++ b/src/intel/perf/oa-chv.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1582124704" merge_md5="">
+<metrics version="1599482526" merge_md5="">
   <set name="Render Metrics Basic Gen8LP"
        chipset="CHV"
        symbol_name="RenderBasic"
@@ -2736,7 +2736,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -3410,7 +3410,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -4091,7 +4091,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -4759,7 +4759,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -5443,7 +5443,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -6216,7 +6216,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -6946,7 +6946,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -7682,7 +7682,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -8496,7 +8496,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -9353,7 +9353,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
diff --git a/src/intel/perf/oa-glk.xml b/src/intel/perf/oa-glk.xml
index 38d9a17..9eee97c 100644 (file)
--- a/src/intel/perf/oa-glk.xml
+++ b/src/intel/perf/oa-glk.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1582124705" merge_md5="">
+<metrics version="1599482527" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        chipset="GLK"
        symbol_name="RenderBasic"
@@ -5454,7 +5454,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -6072,7 +6072,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -6754,7 +6754,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -7403,7 +7403,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -8106,7 +8106,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -8808,7 +8808,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
diff --git a/src/intel/perf/oa-hsw.xml b/src/intel/perf/oa-hsw.xml
index b3ba90b..5dce984 100644 (file)
--- a/src/intel/perf/oa-hsw.xml
+++ b/src/intel/perf/oa-hsw.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1582124704" merge_md5="">
+<metrics version="1599482684" merge_md5="">
   <set name="Render Metrics Basic Gen7.5"
        chipset="HSW"
        symbol_name="RenderBasic"
@@ -825,7 +825,7 @@
              data_type="uint64"
              units="messages"
              semantic_type="event"
-             equation="PERFCNT1 READ_REG"
+             equation="PERFCNT 0 READ"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="LLC"
              mdapi_usage_flags="Tier1 Overview System Frame Batch Draw"
@@ -839,7 +839,7 @@
              data_type="uint64"
              units="messages"
              semantic_type="event"
-             equation="PERFCNT2 READ_REG"
+             equation="PERFCNT 1 READ"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="LLC"
              mdapi_usage_flags="Tier1 Overview System Frame Batch Draw"
@@ -854,7 +854,7 @@
              max_equation="$GpuCoreClocks 64 UMUL"
              units="bytes"
              semantic_type="throughput"
-             equation="PERFCNT1 READ_REG C 7 READ USUB 64 UMUL"
+             equation="PERFCNT 0 READ C 7 READ USUB 64 UMUL"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="LLC"
              mdapi_usage_flags="Tier1 Overview System Frame Batch Draw"
@@ -1733,7 +1733,7 @@
              data_type="uint64"
              units="messages"
              semantic_type="event"
-             equation="PERFCNT1 READ_REG"
+             equation="PERFCNT 0 READ"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="LLC"
              mdapi_usage_flags="Tier1 Overview System Frame Batch Draw"
@@ -1747,7 +1747,7 @@
              data_type="uint64"
              units="messages"
              semantic_type="event"
-             equation="PERFCNT2 READ_REG"
+             equation="PERFCNT 1 READ"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="LLC"
              mdapi_usage_flags="Tier1 Overview System Frame Batch Draw"
@@ -2085,7 +2085,7 @@
              data_type="uint64"
              units="messages"
              semantic_type="event"
-             equation="PERFCNT1 READ_REG"
+             equation="PERFCNT 0 READ"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="LLC"
              mdapi_usage_flags="Tier1 Overview System Frame Batch Draw"
@@ -2099,7 +2099,7 @@
              data_type="uint64"
              units="messages"
              semantic_type="event"
-             equation="PERFCNT2 READ_REG"
+             equation="PERFCNT 1 READ"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="LLC"
              mdapi_usage_flags="Tier1 Overview System Frame Batch Draw"
@@ -2888,7 +2888,7 @@
              data_type="uint64"
              units="messages"
              semantic_type="event"
-             equation="PERFCNT1 READ_REG"
+             equation="PERFCNT 0 READ"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="LLC"
              mdapi_usage_flags="Tier1 Overview System Frame Batch Draw"
@@ -2902,7 +2902,7 @@
              data_type="uint64"
              units="messages"
              semantic_type="event"
-             equation="PERFCNT2 READ_REG"
+             equation="PERFCNT 1 READ"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="LLC"
              mdapi_usage_flags="Tier1 Overview System Frame Batch Draw"
@@ -3689,7 +3689,7 @@
              data_type="uint64"
              units="messages"
              semantic_type="event"
-             equation="PERFCNT1 READ_REG"
+             equation="PERFCNT 0 READ"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="LLC"
              mdapi_usage_flags="Tier1 Overview System Frame Batch Draw"
@@ -3703,7 +3703,7 @@
              data_type="uint64"
              units="messages"
              semantic_type="event"
-             equation="PERFCNT2 READ_REG"
+             equation="PERFCNT 1 READ"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="LLC"
              mdapi_usage_flags="Tier1 Overview System Frame Batch Draw"
@@ -3718,7 +3718,7 @@
              max_equation="$GpuCoreClocks 64 UMUL"
              units="bytes"
              semantic_type="throughput"
-             equation="PERFCNT1 READ_REG $LlcWrAccesses USUB 64 UMUL $LlcWrAccesses 32 UMUL UADD"
+             equation="PERFCNT 0 READ $LlcWrAccesses USUB 64 UMUL $LlcWrAccesses 32 UMUL UADD"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="LLC"
              mdapi_usage_flags="Tier1 Overview System Frame Batch Draw"
@@ -4536,7 +4536,7 @@
              data_type="uint64"
              units="messages"
              semantic_type="event"
-             equation="PERFCNT1 READ_REG"
+             equation="PERFCNT 0 READ"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="LLC"
              mdapi_usage_flags="Tier1 Overview System Frame Batch Draw"
@@ -4550,7 +4550,7 @@
              data_type="uint64"
              units="messages"
              semantic_type="event"
-             equation="PERFCNT2 READ_REG"
+             equation="PERFCNT 1 READ"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="LLC"
              mdapi_usage_flags="Tier1 Overview System Frame Batch Draw"
diff --git a/src/intel/perf/oa-kblgt2.xml b/src/intel/perf/oa-kblgt2.xml
index f7b80f9..6137be6 100644 (file)
--- a/src/intel/perf/oa-kblgt2.xml
+++ b/src/intel/perf/oa-kblgt2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1598356968" merge_md5="">
+<metrics version="1599482527" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        chipset="KBLGT2"
        symbol_name="RenderBasic"
@@ -5462,7 +5462,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -6092,7 +6092,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -6723,7 +6723,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -7319,7 +7319,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -7959,7 +7959,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -8598,7 +8598,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -9277,7 +9277,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -9961,7 +9961,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
diff --git a/src/intel/perf/oa-kblgt3.xml b/src/intel/perf/oa-kblgt3.xml
index 2ff35b5..117a288 100644 (file)
--- a/src/intel/perf/oa-kblgt3.xml
+++ b/src/intel/perf/oa-kblgt3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1598356968" merge_md5="">
+<metrics version="1599482527" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        chipset="KBLGT3"
        symbol_name="RenderBasic"
@@ -5475,7 +5475,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -6106,7 +6106,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -6737,7 +6737,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -7333,7 +7333,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -7973,7 +7973,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -8612,7 +8612,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -9291,7 +9291,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -9975,7 +9975,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
diff --git a/src/intel/perf/oa-sklgt2.xml b/src/intel/perf/oa-sklgt2.xml
index 78aefae..f1125bd 100644 (file)
--- a/src/intel/perf/oa-sklgt2.xml
+++ b/src/intel/perf/oa-sklgt2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1598356967" merge_md5="">
+<metrics version="1599482527" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        chipset="SKLGT2"
        symbol_name="RenderBasic"
@@ -5986,7 +5986,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -6617,7 +6617,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -7249,7 +7249,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -7846,7 +7846,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -8487,7 +8487,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -9127,7 +9127,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -9807,7 +9807,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -10492,7 +10492,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
diff --git a/src/intel/perf/oa-sklgt3.xml b/src/intel/perf/oa-sklgt3.xml
index 1d1d4d6..0870791 100644 (file)
--- a/src/intel/perf/oa-sklgt3.xml
+++ b/src/intel/perf/oa-sklgt3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1598356967" merge_md5="">
+<metrics version="1599482527" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        chipset="SKLGT3"
        symbol_name="RenderBasic"
@@ -5475,7 +5475,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -6105,7 +6105,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -6736,7 +6736,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -7332,7 +7332,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -7972,7 +7972,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -8611,7 +8611,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -9290,7 +9290,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -9974,7 +9974,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
diff --git a/src/intel/perf/oa-sklgt4.xml b/src/intel/perf/oa-sklgt4.xml
index eac1984..4e223a8 100644 (file)
--- a/src/intel/perf/oa-sklgt4.xml
+++ b/src/intel/perf/oa-sklgt4.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1598356968" merge_md5="">
+<metrics version="1599482527" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        chipset="SKLGT4"
        symbol_name="RenderBasic"
@@ -5469,7 +5469,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -6099,7 +6099,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -6730,7 +6730,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -7326,7 +7326,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -7966,7 +7966,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -8605,7 +8605,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -9284,7 +9284,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
@@ -9968,7 +9968,7 @@
              max_equation="100"
              units="percent"
              semantic_type="duration"
-             equation="PERFCNT1 READ_REG 100 UMUL $GpuCoreClocks FDIV"
+             equation="PERFCNT 0 READ 100 UMUL $GpuCoreClocks FDIV"
              availability="true $QueryMode &amp;&amp;"
              mdapi_group="GTI"
              mdapi_usage_flags="Tier3 Overview System Frame Batch Draw"
Domain: Graphics System / GL;