Mesa (master): intel: remove dead code

[GitLab Mirror]

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

Author: Marcin Ślusarz <marcin.slusarz at intel.com>
Date:   Wed Oct 28 20:17:41 2020 +0100

intel: remove dead code

Signed-off-by: Marcin Ślusarz <marcin.slusarz at intel.com>
Acked-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7353>

---

 src/intel/compiler/brw_eu_compact.c   | 1 -
 src/intel/compiler/brw_fs_visitor.cpp | 1 -
 src/intel/dev/gen_device_info.c       | 1 -
 src/intel/genxml/gen_bits_header.py   | 1 -
 src/intel/genxml/gen_macros.h         | 3 ---
 src/intel/perf/gen_perf_mdapi.c       | 2 --
 src/intel/perf/gen_perf_mdapi.h       | 3 ---
 src/intel/perf/gen_perf_query.c       | 1 -
 8 files changed, 13 deletions(-)

diff --git a/src/intel/compiler/brw_eu_compact.c b/src/intel/compiler/brw_eu_compact.c
index f3efe33c5e0..e74fbe6d2ce 100644
--- a/src/intel/compiler/brw_eu_compact.c
+++ b/src/intel/compiler/brw_eu_compact.c
@@ -2230,7 +2230,6 @@ compaction_state_init(struct compaction_state *c,
       c->src0_index_table = gen8_src_index_table;
       c->src1_index_table = gen8_src_index_table;
       break;
-   case 10:
    case 9:
    case 8:
       c->control_index_table = gen8_control_index_table;
diff --git a/src/intel/compiler/brw_fs_visitor.cpp b/src/intel/compiler/brw_fs_visitor.cpp
index 3a105577a33..233e1c80bd9 100644
--- a/src/intel/compiler/brw_fs_visitor.cpp
+++ b/src/intel/compiler/brw_fs_visitor.cpp
@@ -870,7 +870,6 @@ fs_visitor::emit_barrier()
    case 8:
       barrier_id_mask = 0x0f000000u; break;
    case 9:
-   case 10:
       barrier_id_mask = 0x8f000000u; break;
    case 11:
    case 12:
diff --git a/src/intel/dev/gen_device_info.c b/src/intel/dev/gen_device_info.c
index c04953b343d..5e26dc10b8c 100644
--- a/src/intel/dev/gen_device_info.c
+++ b/src/intel/dev/gen_device_info.c
@@ -1238,7 +1238,6 @@ gen_get_device_info_from_pci_id(int pci_id,
 
    switch(devinfo->gen) {
    case 9:
-   case 10:
       devinfo->max_wm_threads = 64 /* threads-per-PSD */
                               * devinfo->num_slices
                               * 4; /* effective subslices per slice */
diff --git a/src/intel/genxml/gen_bits_header.py b/src/intel/genxml/gen_bits_header.py
index 9c0f41b238b..7bad6fa7233 100644
--- a/src/intel/genxml/gen_bits_header.py
+++ b/src/intel/genxml/gen_bits_header.py
@@ -82,7 +82,6 @@ ${item.token_name}_${prop}(const struct gen_device_info *devinfo)
    switch (devinfo->gen) {
    case 12: return ${item.get_prop(prop, 12)};
    case 11: return ${item.get_prop(prop, 11)};
-   case 10: return ${item.get_prop(prop, 10)};
    case 9: return ${item.get_prop(prop, 9)};
    case 8: return ${item.get_prop(prop, 8)};
    case 7:
diff --git a/src/intel/genxml/gen_macros.h b/src/intel/genxml/gen_macros.h
index 9d0172d041c..29d53bcfcff 100644
--- a/src/intel/genxml/gen_macros.h
+++ b/src/intel/genxml/gen_macros.h
@@ -85,9 +85,6 @@
 #elif (GEN_VERSIONx10 == 90)
 #  define GENX(X) GEN9_##X
 #  define genX(x) gen9_##x
-#elif (GEN_VERSIONx10 == 100)
-#  define GENX(X) GEN10_##X
-#  define genX(x) gen10_##x
 #elif (GEN_VERSIONx10 == 110)
 #  define GENX(X) GEN11_##X
 #  define genX(x) gen11_##x
diff --git a/src/intel/perf/gen_perf_mdapi.c b/src/intel/perf/gen_perf_mdapi.c
index ade50678e12..19f1be28bbc 100644
--- a/src/intel/perf/gen_perf_mdapi.c
+++ b/src/intel/perf/gen_perf_mdapi.c
@@ -92,7 +92,6 @@ gen_perf_query_result_write_mdapi(void *data, uint32_t data_size,
       return sizeof(*mdapi_data);
    }
    case 9:
-   case 10:
    case 11:
    case 12:{
       struct gen9_mdapi_metrics *mdapi_data = (struct gen9_mdapi_metrics *) data;
@@ -294,7 +293,6 @@ gen_perf_register_mdapi_oa_query(struct gen_perf_config *perf,
       break;
    }
    case 9:
-   case 10:
    case 11:
    case 12: {
       query = gen_perf_append_query_info(perf, 2 + 36 + 16 + 16 + 16 + 2);
diff --git a/src/intel/perf/gen_perf_mdapi.h b/src/intel/perf/gen_perf_mdapi.h
index 2e326fa7721..8be8d2033ac 100644
--- a/src/intel/perf/gen_perf_mdapi.h
+++ b/src/intel/perf/gen_perf_mdapi.h
@@ -110,7 +110,6 @@ struct gen9_mdapi_metrics {
 };
 
 /* Add new definition */
-#define gen10_mdapi_metrics gen9_mdapi_metrics
 #define gen11_mdapi_metrics gen9_mdapi_metrics
 
 struct mdapi_pipeline_metrics {
@@ -153,7 +152,6 @@ static inline void gen_perf_query_mdapi_write_perfcntr(void *data, uint32_t data
       break;
    }
    case 9:
-   case 10:
    case 11: {
       if (data_size < sizeof(struct gen9_mdapi_metrics))
          return;
@@ -182,7 +180,6 @@ static inline void gen_perf_query_mdapi_write_marker(void *data, uint32_t data_s
       break;
    }
    case 9:
-   case 10:
    case 11: {
       if (data_size < sizeof(struct gen9_mdapi_metrics))
          return;
diff --git a/src/intel/perf/gen_perf_query.c b/src/intel/perf/gen_perf_query.c
index 593ab5c473b..ab78e5fc693 100644
--- a/src/intel/perf/gen_perf_query.c
+++ b/src/intel/perf/gen_perf_query.c
@@ -1412,7 +1412,6 @@ read_gt_frequency(struct gen_perf_context *perf_ctx,
       obj->oa.gt_frequency[1] = GET_FIELD(end, GEN7_RPSTAT1_CURR_GT_FREQ) * 50ULL;
       break;
    case 9:
-   case 10:
    case 11:
    case 12:
       obj->oa.gt_frequency[0] = GET_FIELD(start, GEN9_RPSTAT0_CURR_GT_FREQ) * 50ULL / 3ULL;