Mesa (master): nvc0: fix exposing of metric-issue_slots for SM21/SM30

[Samuel Pitoiset]

Module: Mesa
Branch: master
Commit: a9bc3211f50069480b0a622bccb9ce10af0dd84a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a9bc3211f50069480b0a622bccb9ce10af0dd84a

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Mon May  2 22:12:41 2016 +0200

nvc0: fix exposing of metric-issue_slots for SM21/SM30

This is most likely a copy-paste error when I reworked this area few
weeks ago. For SM20, metric-issue_slots is equal to inst_issued because
there is only one pipeline, so the metric is not exposed there.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reported-by: Karol Herbst <nouveau at karolherbst.de>

---

 .../drivers/nouveau/nvc0/nvc0_query_hw_metric.c    | 24 ++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_metric.c b/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_metric.c
index b961cbf..4b291be 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_metric.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_metric.c
@@ -176,6 +176,17 @@ sm21_issued_ipc =
 };
 
 static const struct nvc0_hw_metric_query_cfg
+sm21_issue_slots =
+{
+   .type        = NVC0_HW_METRIC_QUERY_ISSUE_SLOTS,
+   .queries[0]  = _SM(INST_ISSUED1_0),
+   .queries[1]  = _SM(INST_ISSUED1_1),
+   .queries[2]  = _SM(INST_ISSUED2_0),
+   .queries[3]  = _SM(INST_ISSUED2_1),
+   .num_queries = 4,
+};
+
+static const struct nvc0_hw_metric_query_cfg
 sm21_issue_slot_utilization =
 {
    .type        = NVC0_HW_METRIC_QUERY_ISSUE_SLOT_UTILIZATION,
@@ -195,7 +206,7 @@ static const struct nvc0_hw_metric_query_cfg *sm21_hw_metric_queries[] =
    &sm20_inst_per_wrap,
    &sm21_inst_replay_overhead,
    &sm21_issued_ipc,
-   &sm21_inst_issued,
+   &sm21_issue_slots,
    &sm21_issue_slot_utilization,
    &sm20_ipc,
 };
@@ -258,6 +269,15 @@ sm30_issued_ipc =
 };
 
 static const struct nvc0_hw_metric_query_cfg
+sm30_issue_slots =
+{
+   .type        = NVC0_HW_METRIC_QUERY_ISSUE_SLOTS,
+   .queries[0]  = _SM(INST_ISSUED1),
+   .queries[1]  = _SM(INST_ISSUED2),
+   .num_queries = 2,
+};
+
+static const struct nvc0_hw_metric_query_cfg
 sm30_issue_slot_utilization =
 {
    .type        = NVC0_HW_METRIC_QUERY_ISSUE_SLOT_UTILIZATION,
@@ -294,7 +314,7 @@ static const struct nvc0_hw_metric_query_cfg *sm30_hw_metric_queries[] =
    &sm30_inst_per_wrap,
    &sm30_inst_replay_overhead,
    &sm30_issued_ipc,
-   &sm30_inst_issued,
+   &sm30_issue_slots,
    &sm30_issue_slot_utilization,
    &sm30_ipc,
    &sm30_shared_replay_overhead,