Mesa (staging/21.3): intel/perf: Don't print leading space from desc_units()

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue May 10 06:58:50 UTC 2022


Module: Mesa
Branch: staging/21.3
Commit: ca158e4dd66103fffcf173794c667df43346876c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ca158e4dd66103fffcf173794c667df43346876c

Author: Matt Turner <mattst88 at gmail.com>
Date:   Thu Mar  3 13:13:38 2022 -0800

intel/perf: Don't print leading space from desc_units()

Just an annoyance I noticed when I needed to generate the description
string in two different places.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
(cherry picked from commit 3172b5bbb89ff80f50252752175d402d283429bf)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16405>

---

 src/intel/perf/gen_perf.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/intel/perf/gen_perf.py b/src/intel/perf/gen_perf.py
index be5e829b636..bd50780991e 100644
--- a/src/intel/perf/gen_perf.py
+++ b/src/intel/perf/gen_perf.py
@@ -392,7 +392,7 @@ def desc_units(unit):
         return ""
     if unit == 'hz':
         unit = 'Hz'
-    return " Unit: " + unit + "."
+    return "Unit: " + unit + "."
 
 
 def output_counter_report(set, counter, current_offset):
@@ -419,7 +419,7 @@ def output_counter_report(set, counter, current_offset):
     c("counter = &query->counters[query->n_counters++];\n")
     c("counter->oa_counter_read_" + data_type + " = " + set.read_funcs[counter.get('symbol_name')] + ";\n")
     c("counter->name = \"" + counter.get('name') + "\";\n")
-    c("counter->desc = \"" + counter.get('description') + desc_units(counter.get('units')) + "\";\n")
+    c("counter->desc = \"" + counter.get('description') + " " + desc_units(counter.get('units')) + "\";\n")
     c("counter->symbol_name = \"" + counter.get('symbol_name') + "\";\n")
     c("counter->category = \"" + counter.get('mdapi_group') + "\";\n")
     c("counter->type = INTEL_PERF_COUNTER_TYPE_" + semantic_type_uc + ";\n")



More information about the mesa-commit mailing list