There was a mistake just in those metric sets. We probably didn't
noticed because they're not really interesting for 3D workloads.
Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com>
---
src/mesa/drivers/dri/i965/brw_oa_bdw.xml | 4 ++--
src/mesa/drivers/dri/i965/brw_oa_kblgt2.xml | 4 ++--
src/mesa/drivers/dri/i965/brw_oa_kblgt3.xml | 4 ++--
src/mesa/drivers/dri/i965/brw_oa_sklgt2.xml | 4 ++--
src/mesa/drivers/dri/i965/brw_oa_sklgt3.xml | 4 ++--
src/mesa/drivers/dri/i965/brw_oa_sklgt4.xml | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_oa_bdw.xml
b/src/mesa/drivers/dri/i965/brw_oa_bdw.xml
index c871a563477..fd3c28ffaef 100644
--- a/src/mesa/drivers/dri/i965/brw_oa_bdw.xml
+++ b/src/mesa/drivers/dri/i965/brw_oa_bdw.xml
@@ -14693,7 +14693,7 @@
<counter name="GPU Time Elapsed"
description="Time elapsed on the GPU during the measurement."
data_type="uint64"
- equation="GPU_TIME 0 READ 1000000000 UMUL $GpuTimestampFrequency
UDIV 1000000000 UMUL $GpuTimestampFrequency UDIV"
+ equation="GPU_TIME 0 READ 1000000000 UMUL $GpuTimestampFrequency
UDIV"
underscore_name="gpu_time"
units="ns"
symbol_name="GpuTime"
@@ -14707,7 +14707,7 @@
description="Average GPU Core Frequency in the measurement."
data_type="uint64"
max_equation="$GpuMaxFrequency"
- equation="$GpuCoreClocks 1000000000 UMUL GPU_TIME 0 READ
1000000000 UMUL $GpuTimestampFrequency UDIV UDIV"
+ equation="$GpuCoreClocks 1000000000 UMUL $GpuTime UDIV"
underscore_name="avg_gpu_core_frequency"
units="hz"
symbol_name="AvgGpuCoreFrequency"
diff --git a/src/mesa/drivers/dri/i965/brw_oa_kblgt2.xml
b/src/mesa/drivers/dri/i965/brw_oa_kblgt2.xml
index 821f6066dc4..94d6cf61d13 100644
--- a/src/mesa/drivers/dri/i965/brw_oa_kblgt2.xml
+++ b/src/mesa/drivers/dri/i965/brw_oa_kblgt2.xml
@@ -10083,7 +10083,7 @@
<counter name="GPU Time Elapsed"
description="Time elapsed on the GPU during the measurement."
data_type="uint64"
- equation="GPU_TIME 0 READ 1000000000 UMUL $GpuTimestampFrequency
UDIV 1000000000 UMUL $GpuTimestampFrequency UDIV"
+ equation="GPU_TIME 0 READ 1000000000 UMUL $GpuTimestampFrequency
UDIV"
underscore_name="gpu_time"
units="ns"
symbol_name="GpuTime"
@@ -10097,7 +10097,7 @@
description="Average GPU Core Frequency in the measurement."
data_type="uint64"
max_equation="$GpuMaxFrequency"
- equation="$GpuCoreClocks 1000000000 UMUL GPU_TIME 0 READ
1000000000 UMUL $GpuTimestampFrequency UDIV UDIV"
+ equation="$GpuCoreClocks 1000000000 UMUL $GpuTime UDIV"
underscore_name="avg_gpu_core_frequency"
units="hz"
symbol_name="AvgGpuCoreFrequency"
diff --git a/src/mesa/drivers/dri/i965/brw_oa_kblgt3.xml
b/src/mesa/drivers/dri/i965/brw_oa_kblgt3.xml
index d7a7f0c19a1..a30d51b34c2 100644
--- a/src/mesa/drivers/dri/i965/brw_oa_kblgt3.xml
+++ b/src/mesa/drivers/dri/i965/brw_oa_kblgt3.xml
@@ -10117,7 +10117,7 @@
<counter name="GPU Time Elapsed"
description="Time elapsed on the GPU during the measurement."
data_type="uint64"
- equation="GPU_TIME 0 READ 1000000000 UMUL $GpuTimestampFrequency
UDIV 1000000000 UMUL $GpuTimestampFrequency UDIV"
+ equation="GPU_TIME 0 READ 1000000000 UMUL $GpuTimestampFrequency
UDIV"
underscore_name="gpu_time"
units="ns"
symbol_name="GpuTime"
@@ -10131,7 +10131,7 @@
description="Average GPU Core Frequency in the measurement."
data_type="uint64"
max_equation="$GpuMaxFrequency"
- equation="$GpuCoreClocks 1000000000 UMUL GPU_TIME 0 READ
1000000000 UMUL $GpuTimestampFrequency UDIV UDIV"
+ equation="$GpuCoreClocks 1000000000 UMUL $GpuTime UDIV"
underscore_name="avg_gpu_core_frequency"
units="hz"
symbol_name="AvgGpuCoreFrequency"
diff --git a/src/mesa/drivers/dri/i965/brw_oa_sklgt2.xml
b/src/mesa/drivers/dri/i965/brw_oa_sklgt2.xml
index ee0c4ec67c8..0e2b35bc97c 100644
--- a/src/mesa/drivers/dri/i965/brw_oa_sklgt2.xml
+++ b/src/mesa/drivers/dri/i965/brw_oa_sklgt2.xml
@@ -10584,7 +10584,7 @@
<counter name="GPU Time Elapsed"
description="Time elapsed on the GPU during the measurement."
data_type="uint64"
- equation="GPU_TIME 0 READ 1000000000 UMUL $GpuTimestampFrequency
UDIV 1000000000 UMUL $GpuTimestampFrequency UDIV"
+ equation="GPU_TIME 0 READ 1000000000 UMUL $GpuTimestampFrequency
UDIV"
underscore_name="gpu_time"
units="ns"
symbol_name="GpuTime"
@@ -10598,7 +10598,7 @@
description="Average GPU Core Frequency in the measurement."
data_type="uint64"
max_equation="$GpuMaxFrequency"
- equation="$GpuCoreClocks 1000000000 UMUL GPU_TIME 0 READ
1000000000 UMUL $GpuTimestampFrequency UDIV UDIV"
+ equation="$GpuCoreClocks 1000000000 UMUL $GpuTime UDIV"
underscore_name="avg_gpu_core_frequency"
units="hz"
symbol_name="AvgGpuCoreFrequency"
diff --git a/src/mesa/drivers/dri/i965/brw_oa_sklgt3.xml
b/src/mesa/drivers/dri/i965/brw_oa_sklgt3.xml
index 256307ff4b6..68b6f5ac03f 100644
--- a/src/mesa/drivers/dri/i965/brw_oa_sklgt3.xml
+++ b/src/mesa/drivers/dri/i965/brw_oa_sklgt3.xml
@@ -10116,7 +10116,7 @@
<counter name="GPU Time Elapsed"
description="Time elapsed on the GPU during the measurement."
data_type="uint64"
- equation="GPU_TIME 0 READ 1000000000 UMUL $GpuTimestampFrequency
UDIV 1000000000 UMUL $GpuTimestampFrequency UDIV"
+ equation="GPU_TIME 0 READ 1000000000 UMUL $GpuTimestampFrequency
UDIV"
underscore_name="gpu_time"
units="ns"
symbol_name="GpuTime"
@@ -10130,7 +10130,7 @@
description="Average GPU Core Frequency in the measurement."
data_type="uint64"
max_equation="$GpuMaxFrequency"
- equation="$GpuCoreClocks 1000000000 UMUL GPU_TIME 0 READ
1000000000 UMUL $GpuTimestampFrequency UDIV UDIV"
+ equation="$GpuCoreClocks 1000000000 UMUL $GpuTime UDIV"
underscore_name="avg_gpu_core_frequency"
units="hz"
symbol_name="AvgGpuCoreFrequency"
diff --git a/src/mesa/drivers/dri/i965/brw_oa_sklgt4.xml
b/src/mesa/drivers/dri/i965/brw_oa_sklgt4.xml
index e2a0f43c2e2..30a30065ed9 100644
--- a/src/mesa/drivers/dri/i965/brw_oa_sklgt4.xml
+++ b/src/mesa/drivers/dri/i965/brw_oa_sklgt4.xml
@@ -10139,7 +10139,7 @@
<counter name="GPU Time Elapsed"
description="Time elapsed on the GPU during the measurement."
data_type="uint64"
- equation="GPU_TIME 0 READ 1000000000 UMUL $GpuTimestampFrequency
UDIV 1000000000 UMUL $GpuTimestampFrequency UDIV"
+ equation="GPU_TIME 0 READ 1000000000 UMUL $GpuTimestampFrequency
UDIV"
underscore_name="gpu_time"
units="ns"
symbol_name="GpuTime"
@@ -10153,7 +10153,7 @@
description="Average GPU Core Frequency in the measurement."
data_type="uint64"
max_equation="$GpuMaxFrequency"
- equation="$GpuCoreClocks 1000000000 UMUL GPU_TIME 0 READ
1000000000 UMUL $GpuTimestampFrequency UDIV UDIV"
+ equation="$GpuCoreClocks 1000000000 UMUL $GpuTime UDIV"
underscore_name="avg_gpu_core_frequency"
units="hz"
symbol_name="AvgGpuCoreFrequency"
--
2.15.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
