projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 064a483)
i965: fix time elapsed counter equations in VME/Media configs
authorLionel Landwerlin <lionel.g.landwerlin@intel.com>
Thu, 9 Nov 2017 16:48:45 +0000 (16:48 +0000)
committerLionel Landwerlin <lionel.g.landwerlin@intel.com>
Tue, 28 Nov 2017 13:34:04 +0000 (13:34 +0000)
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.landwerlin@intel.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
src/mesa/drivers/dri/i965/brw_oa_bdw.xml patch | blob | history
src/mesa/drivers/dri/i965/brw_oa_kblgt2.xml patch | blob | history
src/mesa/drivers/dri/i965/brw_oa_kblgt3.xml patch | blob | history
src/mesa/drivers/dri/i965/brw_oa_sklgt2.xml patch | blob | history
src/mesa/drivers/dri/i965/brw_oa_sklgt3.xml patch | blob | history
src/mesa/drivers/dri/i965/brw_oa_sklgt4.xml patch | blob | history

diff --git a/src/mesa/drivers/dri/i965/brw_oa_bdw.xml b/src/mesa/drivers/dri/i965/brw_oa_bdw.xml
index c871a5634770bd2938a43dd9c0071863c9c85969..fd3c28ffaef224edcad640f79c3fe01b2c9ff420 100644 (file)
--- 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 821f6066dc4d6503001d43952954dd754332b211..94d6cf61d137436c462f6705ddf06b39cbe5ab81 100644 (file)
--- 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 d7a7f0c19a1b6ec6715932a350d341a3307ea51b..a30d51b34c24a9679f1ee4ad67f2d6e421ccc5de 100644 (file)
--- 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 ee0c4ec67c802e37654eb1dcf49e58afac3d8f6c..0e2b35bc97ceb61ed4f3545c233288904d875b53 100644 (file)
--- 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 256307ff4b66cdd160efd7ba7d9fb8a155508861..68b6f5ac03f95b1a04d482f94f6e18ef8b7b2a4e 100644 (file)
--- 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 e2a0f43c2e20ca371acb2e2be6869290e20935ea..30a30065ed9849ac60b5a2a66064b2bce7595f16 100644 (file)
--- 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"