[Mesa-dev] [PATCH 2/2] nv50: reduce the number of insn used by the MP perf counters kernel

[Samuel Pitoiset]

Suggested by Ilia Mirkin.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---

Untested patch.

 src/gallium/drivers/nouveau/nv50/nv50_query_hw_sm.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nv50/nv50_query_hw_sm.c b/src/gallium/drivers/nouveau/nv50/nv50_query_hw_sm.c
index 5c75f15..9f49edb 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_query_hw_sm.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_query_hw_sm.c
@@ -61,9 +61,8 @@ static const uint64_t nv50_read_hw_sm_counters_code[] =
     * ld $r5 b32 s[0x10]
     * ld $r6 b32 s[0x14]
     * and b32 $r4 $r4 0x000f0000
-    * shr u32 $r4 $r4 0x10
-    * mul $r4 u24 $r4 0x14
-    * add b32 $r5 $r5 $r4
+    * and b32 $r4 $r4 0x000f0000
+    * add $r5 (mul u16 $r4h 0x14) $r5
     * st b32 g15[$r5] $r0
     * add b32 $r5 $r5 0x04
     * st b32 g15[$r5] $r1
@@ -84,9 +83,7 @@ static const uint64_t nv50_read_hw_sm_counters_code[] =
    0x4400c78010000815ULL,
    0x4400c78010000a19ULL,
    0x0000f003d0000811ULL,
-   0xe410078030100811ULL,
-   0x0000000340540811ULL,
-   0x0401078020000a15ULL,
+   0x0000000360141215ULL,
    0xa0c00780d00f0a01ULL,
    0x0000000320048a15ULL,
    0xa0c00780d00f0a05ULL,
-- 
2.6.4