diff options
| author | Samuel Pitoiset <[email protected]> | 2016-05-02 22:12:41 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2016-05-03 23:18:50 +0200 |
| commit | a9bc3211f50069480b0a622bccb9ce10af0dd84a (patch) | |
| tree | 49c7d54c797265b5231b10023231ccd448fc8e8a | |
| parent | 0af8a7d50ce0fdb8063f7fadd3b78975a2136d87 (diff) | |
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 <[email protected]>
Reported-by: Karol Herbst <[email protected]>
| -rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_metric.c | 24 |
1 files 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 b961cbf652e..4b291be946c 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, |