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@gmail.com>
Reported-by: Karol Herbst <nouveau@karolherbst.de>
This commit is contained in:
Samuel Pitoiset
2016-05-02 22:12:41 +02:00
parent 0af8a7d50c
commit a9bc3211f5
@@ -175,6 +175,17 @@ sm21_issued_ipc =
.num_queries = 5,
};
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 =
{
@@ -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,
};
@@ -257,6 +268,15 @@ sm30_issued_ipc =
.num_queries = 3,
};
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 =
{
@@ -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,