nvc0: remove wrong inst_issued HW SM perf counter on Kepler

inst_issued is performance metric not a hardware event on Kepler (SM30).
It will be re-introduced in an upcoming patch.

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

diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_sm.c b/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_sm.c
index 5ece98b5939d87c823afc0acbfe7bfa4b6744056..a9157e630625ebd6b087f58b4c0088e0aa16e4fe 100644 (file)
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_sm.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_sm.c
@@ -49,7 +49,6 @@ static const char *nve4_hw_sm_query_names[] =
    "gred_count",
    "gst_request",
    "inst_executed",
-   "inst_issued",
    "inst_issued1",
    "inst_issued2",
    "l1_global_load_hit",
@@ -245,7 +244,6 @@ static const struct nvc0_hw_sm_query_cfg nve4_hw_sm_queries[] =
    _Q1A(GRED_COUNT, 0x0001, B6, BRANCH, 0x00000008, 1, 1),
    _Q1A(GST_REQUEST, 0x0001, B6, LDST, 0x00000014, 1, 1),
    _Q1A(INST_EXECUTED, 0x0003, B6, EXEC,  0x00000398, 1, 1),
-   _Q1A(INST_ISSUED,   0x0003, B6, ISSUE, 0x00000104, 1, 1),
    _Q1A(INST_ISSUED1,  0x0001, B6, ISSUE, 0x00000004, 1, 1),
    _Q1A(INST_ISSUED2,  0x0001, B6, ISSUE, 0x00000008, 1, 1),
    _Q1B(L1_GLD_HIT,  0x0001, B6, L1, 0x00000010, 1, 1),

diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_sm.h b/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_sm.h
index 694d74cd043f0c219ba03aff9225d39a4aad6a2b..3722d51374f5c81385df318360beeeb1fa7acadd 100644 (file)
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_sm.h
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_sm.h
@@ -34,7 +34,6 @@ enum nve4_hw_sm_queries
    NVE4_HW_SM_QUERY_GRED_COUNT,
    NVE4_HW_SM_QUERY_GST_REQUEST,
    NVE4_HW_SM_QUERY_INST_EXECUTED,
-   NVE4_HW_SM_QUERY_INST_ISSUED,
    NVE4_HW_SM_QUERY_INST_ISSUED1,
    NVE4_HW_SM_QUERY_INST_ISSUED2,
    NVE4_HW_SM_QUERY_L1_GLD_HIT,