From 064a4831e322351a0bf53b8e26842c6e819b59c9 Mon Sep 17 00:00:00 2001
From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Thu, 9 Nov 2017 16:46:47 +0000
Subject: i965: perf: update counter names on gen8/9 platforms

Just fixing names.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
---
 src/mesa/drivers/dri/i965/brw_oa_bdw.xml    | 50 ++++++++++++++---------------
 src/mesa/drivers/dri/i965/brw_oa_bxt.xml    | 26 +++++++--------
 src/mesa/drivers/dri/i965/brw_oa_glk.xml    | 26 +++++++--------
 src/mesa/drivers/dri/i965/brw_oa_kblgt2.xml | 26 +++++++--------
 src/mesa/drivers/dri/i965/brw_oa_kblgt3.xml | 26 +++++++--------
 src/mesa/drivers/dri/i965/brw_oa_sklgt2.xml | 26 +++++++--------
 src/mesa/drivers/dri/i965/brw_oa_sklgt3.xml | 26 +++++++--------
 src/mesa/drivers/dri/i965/brw_oa_sklgt4.xml | 26 +++++++--------
 8 files changed, 116 insertions(+), 116 deletions(-)

(limited to 'src/mesa/drivers/dri')

diff --git a/src/mesa/drivers/dri/i965/brw_oa_bdw.xml b/src/mesa/drivers/dri/i965/brw_oa_bdw.xml
index 7b5ecabe861..c871a563477 100644
--- a/src/mesa/drivers/dri/i965/brw_oa_bdw.xml
+++ b/src/mesa/drivers/dri/i965/brw_oa_bdw.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1491574821" merge_md5="">
+<metrics version="1508421692" merge_md5="">
   <set name="Render Metrics Basic Gen8"
        mdapi_supported_apis="OGL OCL IO BB"
        underscore_name="render_basic"
@@ -12896,7 +12896,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="EU Array/Vertex Shader"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice1 Subslice1 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice1 Subslice1"
              description="The percentage of time in which PS thread is ready for dispatch on slice1 subslice1 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -12924,7 +12924,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="EU Array/Fragment Shader"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice1 Subslice2 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice1 Subslice2"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice1 subslice2 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -12978,7 +12978,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Output Merger"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice1 Subslice0 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice1 Subslice0"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice1 subslice0 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -12993,7 +12993,7 @@
              mdapi_group="GPU/Thread Dispatcher"
              mdapi_hw_unit_type="subslice"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice1 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice1 Port 0"
              description="The percentage of time in which thread header is ready on slice0 subslice1 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -13008,7 +13008,7 @@
              mdapi_group="GPU/Thread Dispatcher"
              mdapi_hw_unit_type="subslice"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice1 Thread Dispatcher Port 1"
+    <counter name="Thread Header Ready on Slice0 Subslice1 Port 1"
              description="The percentage of time in which thread header is ready on slice0 subslice1 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
@@ -13146,7 +13146,7 @@
              mdapi_group="GPU"
              mdapi_hw_unit_type="gpu"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice2 Thread Dispatcher Port 1"
+    <counter name="Thread Header Ready on Slice0 Subslice2 Port 1"
              description="The percentage of time in which thread header is ready on slice0 subslice2 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
@@ -13161,7 +13161,7 @@
              mdapi_group="GPU/Thread Dispatcher"
              mdapi_hw_unit_type="subslice"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice2 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice2 Port 0"
              description="The percentage of time in which thread header is ready on slice0 subslice2 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -13269,7 +13269,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Rasterizer/Early Depth Test"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice1 Subslice2 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice1 Subslice2"
              description="The percentage of time in which PS thread is ready for dispatch on slice1 subslice2 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -13284,7 +13284,7 @@
              mdapi_group="GPU/Thread Dispatcher"
              mdapi_hw_unit_type="subslice"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice1 Subslice0 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice1 Subslice0"
              description="The percentage of time in which PS thread is ready for dispatch on slice1 subslice0 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -13299,7 +13299,7 @@
              mdapi_group="GPU/Thread Dispatcher"
              mdapi_hw_unit_type="subslice"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice1 Subslice1 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice1 Subslice1"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice1 subslice1 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -13381,7 +13381,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Fragment Shader"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice0 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice0 Port 0"
              description="The percentage of time in which thread header is ready on slice0 subslice0 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -13409,7 +13409,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="L3/Data Port/Atomics"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice0 Thread Dispatcher Port 1"
+    <counter name="Thread Header Ready on Slice0 Subslice0 Port 1"
              description="The percentage of time in which thread header is ready on slice0 subslice0 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
@@ -13656,7 +13656,7 @@
              mdapi_group="EU Array/Pipes"
              mdapi_hw_unit_type="gpu"
              />
-    <counter name="Thread Header Ready on Slice1 Subslice1 Thread Dispatcher Port 1"
+    <counter name="Thread Header Ready on Slice1 Subslice1 Port 1"
              description="The percentage of time in which thread header is ready on slice1 subslice1 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
@@ -13765,7 +13765,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="EU Array/Fragment Shader"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice0 Subslice2 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice0 Subslice2"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice0 subslice2 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -13859,7 +13859,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="Sampler/Sampler Cache"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice0 Subslice0 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice0 Subslice0"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice0 subslice0 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -13901,7 +13901,7 @@
              mdapi_group="L3/Data Port/SLM"
              mdapi_hw_unit_type="gpu"
              />
-    <counter name="Thread Header Ready on Slice1 Subslice1 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice1 Subslice1 Port 0"
              description="The percentage of time in which thread header is ready on slice1 subslice1 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -13972,7 +13972,7 @@
              mdapi_group="GPU"
              mdapi_hw_unit_type="gpu"
              />
-    <counter name="Thread Header Ready on Slice1 Subslice2 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice1 Subslice2 Port 0"
              description="The percentage of time in which thread header is ready on slice1 subslice2 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -13987,7 +13987,7 @@
              mdapi_group="GPU/Thread Dispatcher"
              mdapi_hw_unit_type="subslice"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice0 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice0"
              description="The percentage of time in which PS thread is ready for dispatch on slice0 subslice0 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -14055,7 +14055,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Output Merger"
              />
-    <counter name="Thread Header Ready on Slice1 Subslice0 Thread Dispatcher Port 1"
+    <counter name="Thread Header Ready on Slice1 Subslice0 Port 1"
              description="The percentage of time in which thread header is ready on slice1 subslice0 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
@@ -14110,7 +14110,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Rasterizer/Early Depth Test"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice1 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice1"
              description="The percentage of time in which PS thread is ready for dispatch on slice0 subslice1 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -14125,7 +14125,7 @@
              mdapi_group="GPU/Thread Dispatcher"
              mdapi_hw_unit_type="subslice"
              />
-    <counter name="Thread Header Ready on Slice1 Subslice2 Thread Dispatcher Port 1"
+    <counter name="Thread Header Ready on Slice1 Subslice2 Port 1"
              description="The percentage of time in which thread header is ready on slice1 subslice2 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
@@ -14166,7 +14166,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="EU Array/Hull Shader"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice2 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice2"
              description="The percentage of time in which PS thread is ready for dispatch on slice0 subslice2 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -14222,7 +14222,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Fragment Shader"
              />
-    <counter name="Thread Header Ready on Slice1 Subslice0 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice1 Subslice0 Port 0"
              description="The percentage of time in which thread header is ready on slice1 subslice0 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -14250,7 +14250,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="L3/Data Port/Atomics"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice0 Subslice1 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice0 Subslice1"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice0 subslice1 thread dispatcher"
              data_type="float"
              max_equation="100"
diff --git a/src/mesa/drivers/dri/i965/brw_oa_bxt.xml b/src/mesa/drivers/dri/i965/brw_oa_bxt.xml
index 3e5552b56f8..972ff22e212 100644
--- a/src/mesa/drivers/dri/i965/brw_oa_bxt.xml
+++ b/src/mesa/drivers/dri/i965/brw_oa_bxt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1491575452" merge_md5="">
+<metrics version="1508421694" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        mdapi_supported_apis="OGL OCL IO BB"
        underscore_name="render_basic"
@@ -7697,7 +7697,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="EU Array/Fragment Shader"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice0 Subslice2 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice0 Subslice2"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice0 subslice2 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -7791,7 +7791,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="Sampler/Sampler Cache"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice0 Subslice0 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice0 Subslice0"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice0 subslice0 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -7889,7 +7889,7 @@
              mdapi_group="GPU"
              mdapi_hw_unit_type="gpu"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice0 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice0"
              description="The percentage of time in which PS thread is ready for dispatch on slice0 subslice0 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -7997,7 +7997,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Rasterizer/Early Depth Test"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice1 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice1"
              description="The percentage of time in which PS thread is ready for dispatch on slice0 subslice1 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -8038,7 +8038,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="EU Array/Hull Shader"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice2 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice2"
              description="The percentage of time in which PS thread is ready for dispatch on slice0 subslice2 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -8107,7 +8107,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="L3/Data Port/Atomics"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice0 Subslice1 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice0 Subslice1"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice0 subslice1 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -8422,7 +8422,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Output Merger"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice1 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice1 Port 0"
              description="The percentage of time in which thread header is ready on slice0 subslice1 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -8437,7 +8437,7 @@
              mdapi_group="GPU/Thread Dispatcher"
              mdapi_hw_unit_type="subslice"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice1 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice1 Port 1"
              description="The percentage of time in which thread header is ready on slice0 subslice1 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
@@ -8575,7 +8575,7 @@
              mdapi_group="GPU"
              mdapi_hw_unit_type="gpu"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice2 Thread Dispatcher Port 1"
+    <counter name="Thread Header Ready on Slice0 Subslice2 Port 1"
              description="The percentage of time in which thread header is ready on slice0 subslice2 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
@@ -8590,7 +8590,7 @@
              mdapi_group="GPU/Thread Dispatcher"
              mdapi_hw_unit_type="subslice"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice2 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice2 Port 0"
              description="The percentage of time in which thread header is ready on slice0 subslice2 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -8765,7 +8765,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Fragment Shader"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice0 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice0 Port 0"
              description="The percentage of time in which thread header is ready on slice0 subslice0 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -8793,7 +8793,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="L3/Data Port/Atomics"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice0 Thread Dispatcher Port 1"
+    <counter name="Thread Header Ready on Slice0 Subslice0 Port 1"
              description="The percentage of time in which thread header is ready on slice0 subslice0 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
diff --git a/src/mesa/drivers/dri/i965/brw_oa_glk.xml b/src/mesa/drivers/dri/i965/brw_oa_glk.xml
index d603d834a12..68fcd2d6dde 100644
--- a/src/mesa/drivers/dri/i965/brw_oa_glk.xml
+++ b/src/mesa/drivers/dri/i965/brw_oa_glk.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1493336461" merge_md5="">
+<metrics version="1508420700" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        mdapi_supported_apis="OGL OCL IO BB"
        underscore_name="render_basic"
@@ -7609,7 +7609,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="EU Array/Fragment Shader"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice0 Subslice2 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice0 Subslice2"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice0 subslice2 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -7703,7 +7703,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="Sampler/Sampler Cache"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice0 Subslice0 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice0 Subslice0"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice0 subslice0 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -7801,7 +7801,7 @@
              mdapi_group="GPU"
              mdapi_hw_unit_type="gpu"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice0 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice0"
              description="The percentage of time in which PS thread is ready for dispatch on slice0 subslice0 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -7909,7 +7909,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Rasterizer/Early Depth Test"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice1 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice1"
              description="The percentage of time in which PS thread is ready for dispatch on slice0 subslice1 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -7950,7 +7950,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="EU Array/Hull Shader"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice2 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice2"
              description="The percentage of time in which PS thread is ready for dispatch on slice0 subslice2 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -8019,7 +8019,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="L3/Data Port/Atomics"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice0 Subslice1 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice0 Subslice1"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice0 subslice1 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -8334,7 +8334,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Output Merger"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice1 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice1 Port 0"
              description="The percentage of time in which thread header is ready on slice0 subslice1 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -8349,7 +8349,7 @@
              mdapi_group="GPU/Thread Dispatcher"
              mdapi_hw_unit_type="subslice"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice1 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice1 Port 1"
              description="The percentage of time in which thread header is ready on slice0 subslice1 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
@@ -8487,7 +8487,7 @@
              mdapi_group="GPU"
              mdapi_hw_unit_type="gpu"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice2 Thread Dispatcher Port 1"
+    <counter name="Thread Header Ready on Slice0 Subslice2 Port 1"
              description="The percentage of time in which thread header is ready on slice0 subslice2 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
@@ -8502,7 +8502,7 @@
              mdapi_group="GPU/Thread Dispatcher"
              mdapi_hw_unit_type="subslice"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice2 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice2 Port 0"
              description="The percentage of time in which thread header is ready on slice0 subslice2 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -8677,7 +8677,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Fragment Shader"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice0 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice0 Port 0"
              description="The percentage of time in which thread header is ready on slice0 subslice0 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -8705,7 +8705,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="L3/Data Port/Atomics"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice0 Thread Dispatcher Port 1"
+    <counter name="Thread Header Ready on Slice0 Subslice0 Port 1"
              description="The percentage of time in which thread header is ready on slice0 subslice0 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
diff --git a/src/mesa/drivers/dri/i965/brw_oa_kblgt2.xml b/src/mesa/drivers/dri/i965/brw_oa_kblgt2.xml
index 9ebe1c1b589..821f6066dc4 100644
--- a/src/mesa/drivers/dri/i965/brw_oa_kblgt2.xml
+++ b/src/mesa/drivers/dri/i965/brw_oa_kblgt2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1491576018" merge_md5="">
+<metrics version="1508421694" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        mdapi_supported_apis="OGL OCL IO BB"
        underscore_name="render_basic"
@@ -8748,7 +8748,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="EU Array/Fragment Shader"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice0 Subslice2 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice0 Subslice2"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice0 subslice2 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -8842,7 +8842,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="Sampler/Sampler Cache"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice0 Subslice0 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice0 Subslice0"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice0 subslice0 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -8940,7 +8940,7 @@
              mdapi_group="GPU"
              mdapi_hw_unit_type="gpu"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice0 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice0"
              description="The percentage of time in which PS thread is ready for dispatch on slice0 subslice0 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -9048,7 +9048,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Rasterizer/Early Depth Test"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice1 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice1"
              description="The percentage of time in which PS thread is ready for dispatch on slice0 subslice1 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -9089,7 +9089,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="EU Array/Hull Shader"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice2 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice2"
              description="The percentage of time in which PS thread is ready for dispatch on slice0 subslice2 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -9158,7 +9158,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="L3/Data Port/Atomics"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice0 Subslice1 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice0 Subslice1"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice0 subslice1 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -9455,7 +9455,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Output Merger"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice1 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice1 Port 0"
              description="The percentage of time in which thread header is ready on slice0 subslice1 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -9470,7 +9470,7 @@
              mdapi_group="GPU/Thread Dispatcher"
              mdapi_hw_unit_type="subslice"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice1 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice1 Port 1"
              description="The percentage of time in which thread header is ready on slice0 subslice1 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
@@ -9608,7 +9608,7 @@
              mdapi_group="GPU"
              mdapi_hw_unit_type="gpu"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice2 Thread Dispatcher Port 1"
+    <counter name="Thread Header Ready on Slice0 Subslice2 Port 1"
              description="The percentage of time in which thread header is ready on slice0 subslice2 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
@@ -9623,7 +9623,7 @@
              mdapi_group="GPU/Thread Dispatcher"
              mdapi_hw_unit_type="subslice"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice2 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice2 Port 0"
              description="The percentage of time in which thread header is ready on slice0 subslice2 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -9798,7 +9798,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Fragment Shader"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice0 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice0 Port 0"
              description="The percentage of time in which thread header is ready on slice0 subslice0 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -9826,7 +9826,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="L3/Data Port/Atomics"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice0 Thread Dispatcher Port 1"
+    <counter name="Thread Header Ready on Slice0 Subslice0 Port 1"
              description="The percentage of time in which thread header is ready on slice0 subslice0 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
diff --git a/src/mesa/drivers/dri/i965/brw_oa_kblgt3.xml b/src/mesa/drivers/dri/i965/brw_oa_kblgt3.xml
index 3aa8eabf9e0..d7a7f0c19a1 100644
--- a/src/mesa/drivers/dri/i965/brw_oa_kblgt3.xml
+++ b/src/mesa/drivers/dri/i965/brw_oa_kblgt3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1491576028" merge_md5="">
+<metrics version="1508421695" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        mdapi_supported_apis="OGL OCL IO BB"
        underscore_name="render_basic"
@@ -8762,7 +8762,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="EU Array/Fragment Shader"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice0 Subslice2 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice0 Subslice2"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice0 subslice2 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -8856,7 +8856,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="Sampler/Sampler Cache"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice0 Subslice0 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice0 Subslice0"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice0 subslice0 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -8954,7 +8954,7 @@
              mdapi_group="GPU"
              mdapi_hw_unit_type="gpu"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice0 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice0"
              description="The percentage of time in which PS thread is ready for dispatch on slice0 subslice0 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -9062,7 +9062,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Rasterizer/Early Depth Test"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice1 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice1"
              description="The percentage of time in which PS thread is ready for dispatch on slice0 subslice1 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -9103,7 +9103,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="EU Array/Hull Shader"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice2 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice2"
              description="The percentage of time in which PS thread is ready for dispatch on slice0 subslice2 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -9172,7 +9172,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="L3/Data Port/Atomics"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice0 Subslice1 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice0 Subslice1"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice0 subslice1 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -9469,7 +9469,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Output Merger"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice1 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice1 Port 0"
              description="The percentage of time in which thread header is ready on slice0 subslice1 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -9484,7 +9484,7 @@
              mdapi_group="GPU/Thread Dispatcher"
              mdapi_hw_unit_type="subslice"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice1 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice1 Port 1"
              description="The percentage of time in which thread header is ready on slice0 subslice1 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
@@ -9622,7 +9622,7 @@
              mdapi_group="GPU"
              mdapi_hw_unit_type="gpu"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice2 Thread Dispatcher Port 1"
+    <counter name="Thread Header Ready on Slice0 Subslice2 Port 1"
              description="The percentage of time in which thread header is ready on slice0 subslice2 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
@@ -9637,7 +9637,7 @@
              mdapi_group="GPU/Thread Dispatcher"
              mdapi_hw_unit_type="subslice"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice2 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice2 Port 0"
              description="The percentage of time in which thread header is ready on slice0 subslice2 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -9812,7 +9812,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Fragment Shader"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice0 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice0 Port 0"
              description="The percentage of time in which thread header is ready on slice0 subslice0 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -9840,7 +9840,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="L3/Data Port/Atomics"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice0 Thread Dispatcher Port 1"
+    <counter name="Thread Header Ready on Slice0 Subslice0 Port 1"
              description="The percentage of time in which thread header is ready on slice0 subslice0 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
diff --git a/src/mesa/drivers/dri/i965/brw_oa_sklgt2.xml b/src/mesa/drivers/dri/i965/brw_oa_sklgt2.xml
index bed8876b517..ee0c4ec67c8 100644
--- a/src/mesa/drivers/dri/i965/brw_oa_sklgt2.xml
+++ b/src/mesa/drivers/dri/i965/brw_oa_sklgt2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1491577975" merge_md5="">
+<metrics version="1508421693" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        mdapi_supported_apis="OGL OCL IO BB"
        underscore_name="render_basic"
@@ -9247,7 +9247,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="EU Array/Fragment Shader"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice0 Subslice2 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice0 Subslice2"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice0 subslice2 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -9341,7 +9341,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="Sampler/Sampler Cache"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice0 Subslice0 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice0 Subslice0"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice0 subslice0 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -9439,7 +9439,7 @@
              mdapi_group="GPU"
              mdapi_hw_unit_type="gpu"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice0 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice0"
              description="The percentage of time in which PS thread is ready for dispatch on slice0 subslice0 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -9547,7 +9547,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Rasterizer/Early Depth Test"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice1 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice1"
              description="The percentage of time in which PS thread is ready for dispatch on slice0 subslice1 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -9588,7 +9588,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="EU Array/Hull Shader"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice2 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice2"
              description="The percentage of time in which PS thread is ready for dispatch on slice0 subslice2 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -9657,7 +9657,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="L3/Data Port/Atomics"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice0 Subslice1 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice0 Subslice1"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice0 subslice1 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -9955,7 +9955,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Output Merger"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice1 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice1 Port 0"
              description="The percentage of time in which thread header is ready on slice0 subslice1 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -9970,7 +9970,7 @@
              mdapi_group="GPU/Thread Dispatcher"
              mdapi_hw_unit_type="subslice"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice1 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice1 Port 1"
              description="The percentage of time in which thread header is ready on slice0 subslice1 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
@@ -10108,7 +10108,7 @@
              mdapi_group="GPU"
              mdapi_hw_unit_type="gpu"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice2 Thread Dispatcher Port 1"
+    <counter name="Thread Header Ready on Slice0 Subslice2 Port 1"
              description="The percentage of time in which thread header is ready on slice0 subslice2 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
@@ -10123,7 +10123,7 @@
              mdapi_group="GPU/Thread Dispatcher"
              mdapi_hw_unit_type="subslice"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice2 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice2 Port 0"
              description="The percentage of time in which thread header is ready on slice0 subslice2 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -10298,7 +10298,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Fragment Shader"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice0 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice0 Port 0"
              description="The percentage of time in which thread header is ready on slice0 subslice0 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -10326,7 +10326,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="L3/Data Port/Atomics"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice0 Thread Dispatcher Port 1"
+    <counter name="Thread Header Ready on Slice0 Subslice0 Port 1"
              description="The percentage of time in which thread header is ready on slice0 subslice0 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
diff --git a/src/mesa/drivers/dri/i965/brw_oa_sklgt3.xml b/src/mesa/drivers/dri/i965/brw_oa_sklgt3.xml
index 0f59ab654b3..256307ff4b6 100644
--- a/src/mesa/drivers/dri/i965/brw_oa_sklgt3.xml
+++ b/src/mesa/drivers/dri/i965/brw_oa_sklgt3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1491577975" merge_md5="">
+<metrics version="1508421693" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        mdapi_supported_apis="OGL OCL IO BB"
        underscore_name="render_basic"
@@ -8761,7 +8761,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="EU Array/Fragment Shader"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice0 Subslice2 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice0 Subslice2"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice0 subslice2 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -8855,7 +8855,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="Sampler/Sampler Cache"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice0 Subslice0 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice0 Subslice0"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice0 subslice0 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -8953,7 +8953,7 @@
              mdapi_group="GPU"
              mdapi_hw_unit_type="gpu"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice0 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice0"
              description="The percentage of time in which PS thread is ready for dispatch on slice0 subslice0 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -9061,7 +9061,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Rasterizer/Early Depth Test"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice1 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice1"
              description="The percentage of time in which PS thread is ready for dispatch on slice0 subslice1 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -9102,7 +9102,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="EU Array/Hull Shader"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice2 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice2"
              description="The percentage of time in which PS thread is ready for dispatch on slice0 subslice2 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -9171,7 +9171,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="L3/Data Port/Atomics"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice0 Subslice1 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice0 Subslice1"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice0 subslice1 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -9468,7 +9468,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Output Merger"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice1 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice1 Port 0"
              description="The percentage of time in which thread header is ready on slice0 subslice1 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -9483,7 +9483,7 @@
              mdapi_group="GPU/Thread Dispatcher"
              mdapi_hw_unit_type="subslice"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice1 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice1 Port 1"
              description="The percentage of time in which thread header is ready on slice0 subslice1 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
@@ -9621,7 +9621,7 @@
              mdapi_group="GPU"
              mdapi_hw_unit_type="gpu"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice2 Thread Dispatcher Port 1"
+    <counter name="Thread Header Ready on Slice0 Subslice2 Port 1"
              description="The percentage of time in which thread header is ready on slice0 subslice2 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
@@ -9636,7 +9636,7 @@
              mdapi_group="GPU/Thread Dispatcher"
              mdapi_hw_unit_type="subslice"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice2 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice2 Port 0"
              description="The percentage of time in which thread header is ready on slice0 subslice2 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -9811,7 +9811,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Fragment Shader"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice0 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice0 Port 0"
              description="The percentage of time in which thread header is ready on slice0 subslice0 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -9839,7 +9839,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="L3/Data Port/Atomics"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice0 Thread Dispatcher Port 1"
+    <counter name="Thread Header Ready on Slice0 Subslice0 Port 1"
              description="The percentage of time in which thread header is ready on slice0 subslice0 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
diff --git a/src/mesa/drivers/dri/i965/brw_oa_sklgt4.xml b/src/mesa/drivers/dri/i965/brw_oa_sklgt4.xml
index 51f59be0cea..e2a0f43c2e2 100644
--- a/src/mesa/drivers/dri/i965/brw_oa_sklgt4.xml
+++ b/src/mesa/drivers/dri/i965/brw_oa_sklgt4.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1491577975" merge_md5="">
+<metrics version="1508421694" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        mdapi_supported_apis="OGL OCL IO BB"
        underscore_name="render_basic"
@@ -8755,7 +8755,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="EU Array/Fragment Shader"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice0 Subslice2 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice0 Subslice2"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice0 subslice2 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -8849,7 +8849,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="Sampler/Sampler Cache"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice0 Subslice0 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice0 Subslice0"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice0 subslice0 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -8947,7 +8947,7 @@
              mdapi_group="GPU"
              mdapi_hw_unit_type="gpu"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice0 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice0"
              description="The percentage of time in which PS thread is ready for dispatch on slice0 subslice0 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -9055,7 +9055,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Rasterizer/Early Depth Test"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice1 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice1"
              description="The percentage of time in which PS thread is ready for dispatch on slice0 subslice1 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -9096,7 +9096,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="EU Array/Hull Shader"
              />
-    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice2 Thread Dispatcher"
+    <counter name="PS Thread Ready For Dispatch on Slice0 Subslice2"
              description="The percentage of time in which PS thread is ready for dispatch on slice0 subslice2 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -9165,7 +9165,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="L3/Data Port/Atomics"
              />
-    <counter name="Non-PS Thread Ready For Dispatch on Slice0 Subslice1 Thread Dispatcher"
+    <counter name="NonPS Thread Ready For Dispatch on Slice0 Subslice1"
              description="The percentage of time in which non-PS thread is ready for dispatch on slice0 subslice1 thread dispatcher"
              data_type="float"
              max_equation="100"
@@ -9462,7 +9462,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Output Merger"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice1 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice1 Port 0"
              description="The percentage of time in which thread header is ready on slice0 subslice1 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -9477,7 +9477,7 @@
              mdapi_group="GPU/Thread Dispatcher"
              mdapi_hw_unit_type="subslice"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice1 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice1 Port 1"
              description="The percentage of time in which thread header is ready on slice0 subslice1 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
@@ -9615,7 +9615,7 @@
              mdapi_group="GPU"
              mdapi_hw_unit_type="gpu"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice2 Thread Dispatcher Port 1"
+    <counter name="Thread Header Ready on Slice0 Subslice2 Port 1"
              description="The percentage of time in which thread header is ready on slice0 subslice2 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
@@ -9630,7 +9630,7 @@
              mdapi_group="GPU/Thread Dispatcher"
              mdapi_hw_unit_type="subslice"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice2 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice2 Port 0"
              description="The percentage of time in which thread header is ready on slice0 subslice2 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -9805,7 +9805,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="3D Pipe/Fragment Shader"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice0 Thread Dispatcher Port 0"
+    <counter name="Thread Header Ready on Slice0 Subslice0 Port 0"
              description="The percentage of time in which thread header is ready on slice0 subslice0 thread dispatcher port 0"
              data_type="float"
              max_equation="100"
@@ -9833,7 +9833,7 @@
              mdapi_hw_unit_type="gpu"
              mdapi_group="L3/Data Port/Atomics"
              />
-    <counter name="Thread Header Ready on Slice0 Subslice0 Thread Dispatcher Port 1"
+    <counter name="Thread Header Ready on Slice0 Subslice0 Port 1"
              description="The percentage of time in which thread header is ready on slice0 subslice0 thread dispatcher port 1"
              data_type="float"
              max_equation="100"
-- 
cgit v1.2.3