* [igt-dev] [PATCH i-g-t 01/14] lib: Remove unused headers
@ 2022-05-31 14:28 Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 02/14] assembler: " Ryszard Knop
` (12 more replies)
0 siblings, 13 replies; 14+ messages in thread
From: Ryszard Knop @ 2022-05-31 14:28 UTC (permalink / raw)
To: Development mailing list for IGT GPU Tools
Using CLion's automated code inspection, most unused includes were found
and removed. Some warnings remain as CLion is unable to track code usage
across certain attributes, but the vast majority of unneeded headers are
now gone.
Signed-off-by: Ryszard Knop <ryszard.knop@intel.com>
---
lib/drmtest.c | 18 ------------------
lib/i915/gem_mman.c | 1 -
lib/i915/gem_scheduler.c | 1 -
lib/i915/i915_blt.c | 4 ----
lib/i915/intel_memory_region.c | 7 -------
lib/i915/perf.c | 1 -
lib/i915/perf_data_reader.c | 2 --
lib/igt.h | 13 +++++++------
lib/igt_alsa.c | 4 ----
lib/igt_audio.c | 2 --
lib/igt_aux.c | 15 ---------------
lib/igt_chamelium.c | 1 -
lib/igt_chamelium_stream.c | 2 --
lib/igt_core.c | 11 -----------
lib/igt_debugfs.c | 3 ---
lib/igt_device.c | 1 -
lib/igt_device_scan.c | 1 -
lib/igt_drm_fdinfo.c | 1 -
lib/igt_dummyload.c | 1 -
lib/igt_edid.c | 2 --
lib/igt_eld.c | 4 ----
lib/igt_frame.c | 2 --
lib/igt_gt.c | 5 -----
lib/igt_infoframe.c | 2 --
lib/igt_kms.c | 3 ---
lib/igt_msm.c | 3 ---
lib/igt_nouveau.c | 1 -
lib/igt_panfrost.c | 9 +--------
lib/igt_params.c | 1 -
lib/igt_pm.c | 1 -
lib/igt_primes.c | 1 -
lib/igt_rapl.c | 1 -
lib/igt_sysfs.c | 5 -----
lib/igt_thread.c | 2 --
lib/igt_v3d.c | 8 --------
lib/igt_vc4.c | 7 -------
lib/igt_x86.c | 1 -
lib/instdone.c | 1 -
lib/intel_allocator_msgchannel.c | 1 -
lib/intel_allocator_random.c | 2 --
lib/intel_allocator_reloc.c | 2 --
lib/intel_allocator_simple.c | 3 ---
lib/intel_batchbuffer.c | 3 ---
lib/intel_chipset.c | 7 -------
lib/intel_device_info.c | 2 --
lib/intel_iosf.c | 3 ---
lib/intel_mmio.c | 7 -------
lib/intel_os.c | 5 -----
lib/intel_reg_map.c | 3 ---
lib/ioctl_wrappers.c | 15 ---------------
lib/media_fill.c | 1 -
lib/media_spin.c | 1 -
lib/nouveau/cea0b5.c | 2 --
lib/rendercopy_gen6.c | 11 -----------
lib/rendercopy_gen7.c | 11 -----------
lib/rendercopy_gen8.c | 13 -------------
lib/rendercopy_gen9.c | 13 -------------
lib/rendercopy_i830.c | 9 ---------
lib/rendercopy_i915.c | 9 ---------
lib/sw_sync.c | 3 ---
lib/tests/igt_assert.c | 3 ---
lib/tests/igt_audio.c | 2 --
lib/tests/igt_conflicting_args.c | 2 --
lib/tests/igt_describe.c | 1 -
lib/tests/igt_dynamic_subtests.c | 1 -
lib/tests/igt_edid.c | 2 --
lib/tests/igt_exit_handler.c | 1 -
lib/tests/igt_fork.c | 1 -
lib/tests/igt_fork_helper.c | 1 -
lib/tests/igt_invalid_subtest_name.c | 1 -
lib/tests/igt_segfault.c | 3 ---
lib/tests/igt_simulation.c | 3 ---
lib/veboxcopy_gen12.c | 1 -
73 files changed, 8 insertions(+), 288 deletions(-)
diff --git a/lib/drmtest.c b/lib/drmtest.c
index 09a9a229..48fa09df 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -26,42 +26,24 @@
*
*/
-#ifdef HAVE_LIBGEN_H
-#include <libgen.h>
-#endif
#include <stdio.h>
#include <fcntl.h>
#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <string.h>
-#include <sys/mman.h>
-#include <signal.h>
-#include <pciaccess.h>
-#include <stdlib.h>
#include <unistd.h>
-#include <sys/wait.h>
#include <sys/types.h>
-#include <sys/syscall.h>
-#include <sys/utsname.h>
-#include <termios.h>
#include <pthread.h>
#include "drmtest.h"
#include "i915_drm.h"
#include "i915/gem.h"
-#include "intel_chipset.h"
-#include "intel_io.h"
#include "igt_debugfs.h"
#include "igt_device.h"
-#include "igt_gt.h"
#include "igt_kmod.h"
#include "igt_params.h"
-#include "igt_sysfs.h"
#include "igt_device_scan.h"
#include "version.h"
#include "config.h"
-#include "intel_reg.h"
-#include "ioctl_wrappers.h"
#include "igt_dummyload.h"
/**
diff --git a/lib/i915/gem_mman.c b/lib/i915/gem_mman.c
index aa9ac6f3..ec9feccf 100644
--- a/lib/i915/gem_mman.c
+++ b/lib/i915/gem_mman.c
@@ -27,7 +27,6 @@
#include <errno.h>
#include "igt_core.h"
-#include "igt_gt.h"
#include "igt_device.h"
#include "ioctl_wrappers.h"
#include "intel_chipset.h"
diff --git a/lib/i915/gem_scheduler.c b/lib/i915/gem_scheduler.c
index 0087df90..e80c775a 100644
--- a/lib/i915/gem_scheduler.c
+++ b/lib/i915/gem_scheduler.c
@@ -28,7 +28,6 @@
#include "igt_core.h"
#include "ioctl_wrappers.h"
-#include "i915/i915_drm_local.h"
#include "i915/gem_scheduler.h"
#include "i915/gem_submission.h"
diff --git a/lib/i915/i915_blt.c b/lib/i915/i915_blt.c
index 8d46e51f..d2d13a53 100644
--- a/lib/i915/i915_blt.c
+++ b/lib/i915/i915_blt.c
@@ -3,12 +3,8 @@
* Copyright © 2022 Intel Corporation
*/
-#include <errno.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
#include <malloc.h>
#include <cairo.h>
-#include "drm.h"
#include "igt.h"
#include "gem_create.h"
#include "i915_blt.h"
diff --git a/lib/i915/intel_memory_region.c b/lib/i915/intel_memory_region.c
index 6bf6aab1..e4e755a7 100644
--- a/lib/i915/intel_memory_region.c
+++ b/lib/i915/intel_memory_region.c
@@ -21,12 +21,9 @@
* IN THE SOFTWARE.
*/
-#include <linux/limits.h>
#include <signal.h>
#include <sys/ioctl.h>
-#include <sys/time.h>
#include <sys/types.h>
-#include <sys/stat.h>
#include <fcntl.h>
#include <pthread.h>
@@ -36,12 +33,8 @@
#include "ioctl_wrappers.h"
#include "igt_aux.h"
#include "igt_dummyload.h"
-#include "igt_gt.h"
-#include "igt_params.h"
-#include "igt_sysfs.h"
#include "intel_chipset.h"
#include "igt_collection.h"
-#include "igt_device.h"
#include "gem_mman.h"
#include "i915/intel_memory_region.h"
diff --git a/lib/i915/perf.c b/lib/i915/perf.c
index d88835ff..ebb038c6 100644
--- a/lib/i915/perf.c
+++ b/lib/i915/perf.c
@@ -30,7 +30,6 @@
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <sys/sysmacros.h>
-#include <sys/types.h>
#include <unistd.h>
#include <i915_drm.h>
diff --git a/lib/i915/perf_data_reader.c b/lib/i915/perf_data_reader.c
index e69189ac..d73a7e31 100644
--- a/lib/i915/perf_data_reader.c
+++ b/lib/i915/perf_data_reader.c
@@ -26,9 +26,7 @@
#include <stdlib.h>
#include <string.h>
#include <sys/mman.h>
-#include <sys/types.h>
#include <sys/stat.h>
-#include <unistd.h>
#include <i915_drm.h>
diff --git a/lib/igt.h b/lib/igt.h
index 96a368e1..869515e8 100644
--- a/lib/igt.h
+++ b/lib/igt.h
@@ -39,12 +39,6 @@
#include "igt_params.h"
#include "igt_pm.h"
#include "igt_stats.h"
-#ifdef HAVE_CHAMELIUM
-#include "igt_alsa.h"
-#include "igt_audio.h"
-#include "igt_chamelium.h"
-#include "igt_chamelium_stream.h"
-#endif
#include "instdone.h"
#include "intel_batchbuffer.h"
#include "intel_chipset.h"
@@ -56,4 +50,11 @@
#include "i915/gem_mman.h"
#include "i915/gem_engine_topology.h"
+#ifdef HAVE_CHAMELIUM
+#include "igt_alsa.h"
+#include "igt_audio.h"
+#include "igt_chamelium.h"
+#include "igt_chamelium_stream.h"
+#endif
+
#endif /* IGT_H */
diff --git a/lib/igt_alsa.c b/lib/igt_alsa.c
index e1836be7..67ac7c37 100644
--- a/lib/igt_alsa.c
+++ b/lib/igt_alsa.c
@@ -24,10 +24,6 @@
* Paul Kocialkowski <paul.kocialkowski@linux.intel.com>
*/
-#include "config.h"
-
-#include <limits.h>
-
#include "igt_alsa.h"
#include "igt_aux.h"
#include "igt_core.h"
diff --git a/lib/igt_audio.c b/lib/igt_audio.c
index e0b1bafe..ec020e95 100644
--- a/lib/igt_audio.c
+++ b/lib/igt_audio.c
@@ -24,8 +24,6 @@
* Paul Kocialkowski <paul.kocialkowski@linux.intel.com>
*/
-#include "config.h"
-
#include <errno.h>
#include <fcntl.h>
#include <gsl/gsl_fft_real.h>
diff --git a/lib/igt_aux.c b/lib/igt_aux.c
index 9431960f..9781f8a8 100644
--- a/lib/igt_aux.c
+++ b/lib/igt_aux.c
@@ -37,17 +37,12 @@
#include <string.h>
#include <sys/mman.h>
#include <signal.h>
-#include <pciaccess.h>
#include <stdlib.h>
#include <time.h>
#include <unistd.h>
#include <sys/poll.h>
#include <sys/wait.h>
#include <sys/resource.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <sys/utsname.h>
#include <termios.h>
#include <assert.h>
#include <grp.h>
@@ -56,24 +51,14 @@
#include <libudev.h>
#include "drmtest.h"
-#include "i915_drm.h"
-#include "intel_chipset.h"
#include "igt_aux.h"
#include "igt_debugfs.h"
-#include "igt_gt.h"
#include "igt_params.h"
#include "igt_rand.h"
#include "igt_sysfs.h"
#include "config.h"
-#include "intel_reg.h"
#include "ioctl_wrappers.h"
-#include "igt_kms.h"
#include "igt_stats.h"
-#include "igt_sysfs.h"
-
-#ifdef HAVE_LIBGEN_H
-#include <libgen.h> /* for dirname() */
-#endif
/**
* SECTION:igt_aux
diff --git a/lib/igt_chamelium.c b/lib/igt_chamelium.c
index 55cbfa12..d30aba95 100644
--- a/lib/igt_chamelium.c
+++ b/lib/igt_chamelium.c
@@ -28,7 +28,6 @@
#include <stdbool.h>
#include <string.h>
-#include <errno.h>
#include <math.h>
#include <xmlrpc-c/base.h>
#include <xmlrpc-c/client.h>
diff --git a/lib/igt_chamelium_stream.c b/lib/igt_chamelium_stream.c
index a8cd19e5..58f30d97 100644
--- a/lib/igt_chamelium_stream.c
+++ b/lib/igt_chamelium_stream.c
@@ -23,8 +23,6 @@
* Authors: Simon Ser <simon.ser@intel.com>
*/
-#include "config.h"
-
#include <arpa/inet.h>
#include <errno.h>
#include <netdb.h>
diff --git a/lib/igt_core.c b/lib/igt_core.c
index e7425326..73a8b22c 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -32,10 +32,7 @@
#include <stdio.h>
#include <assert.h>
#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <string.h>
-#include <sys/mman.h>
#include <signal.h>
#include <pciaccess.h>
#include <getopt.h>
@@ -48,7 +45,6 @@
#endif
#include <pthread.h>
#include <sys/utsname.h>
-#include <termios.h>
#include <errno.h>
#include <time.h>
#include <ctype.h>
@@ -61,8 +57,6 @@
#include "i915/gem_create.h"
#include "intel_allocator.h"
#include "intel_batchbuffer.h"
-#include "intel_chipset.h"
-#include "intel_io.h"
#include "igt_debugfs.h"
#include "igt_dummyload.h"
#include "version.h"
@@ -72,7 +66,6 @@
#include "igt_aux.h"
#include "igt_sysfs.h"
#include "igt_sysrq.h"
-#include "igt_rc.h"
#include "igt_list.h"
#include "igt_device_scan.h"
#include "igt_thread.h"
@@ -81,10 +74,6 @@
#include <libunwind.h>
#include <elfutils/libdwfl.h>
-#ifdef HAVE_LIBGEN_H
-#include <libgen.h> /* for basename() on Solaris */
-#endif
-
/**
* SECTION:igt_core
* @short_description: Core i-g-t testing support
diff --git a/lib/igt_debugfs.c b/lib/igt_debugfs.c
index 7211c410..a8d847c9 100644
--- a/lib/igt_debugfs.c
+++ b/lib/igt_debugfs.c
@@ -26,15 +26,12 @@
#include <sys/stat.h>
#include <sys/mount.h>
#include <sys/sysmacros.h>
-#include <dirent.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
-#include <limits.h>
#include <string.h>
#include <fcntl.h>
#include <unistd.h>
-#include <i915_drm.h>
#include <poll.h>
#include "drmtest.h"
diff --git a/lib/igt_device.c b/lib/igt_device.c
index fddfba72..83ae7b21 100644
--- a/lib/igt_device.c
+++ b/lib/igt_device.c
@@ -21,7 +21,6 @@
* IN THE SOFTWARE.
*
*/
-#include <sys/types.h>
#include <fcntl.h>
#include <sys/stat.h>
diff --git a/lib/igt_device_scan.c b/lib/igt_device_scan.c
index 3c23fe0e..f1fe9c1f 100644
--- a/lib/igt_device_scan.c
+++ b/lib/igt_device_scan.c
@@ -28,7 +28,6 @@
#include "intel_chipset.h"
#include <ctype.h>
-#include <dirent.h>
#include <fcntl.h>
#include <glib.h>
#include <libudev.h>
diff --git a/lib/igt_drm_fdinfo.c b/lib/igt_drm_fdinfo.c
index b422f67a..e0c0dd92 100644
--- a/lib/igt_drm_fdinfo.c
+++ b/lib/igt_drm_fdinfo.c
@@ -24,7 +24,6 @@
#include <ctype.h>
#include <sys/types.h>
-#include <sys/stat.h>
#include <fcntl.h>
#include <stdio.h>
#include <string.h>
diff --git a/lib/igt_dummyload.c b/lib/igt_dummyload.c
index dc1bd51e..0c949177 100644
--- a/lib/igt_dummyload.c
+++ b/lib/igt_dummyload.c
@@ -35,7 +35,6 @@
#include "i915/gem_engine_topology.h"
#include "i915/gem_mman.h"
#include "i915/gem_submission.h"
-#include "igt_aux.h"
#include "igt_core.h"
#include "igt_device.h"
#include "igt_dummyload.h"
diff --git a/lib/igt_edid.c b/lib/igt_edid.c
index bff13a0d..cfdb1649 100644
--- a/lib/igt_edid.c
+++ b/lib/igt_edid.c
@@ -23,8 +23,6 @@
* Authors: Simon Ser <simon.ser@intel.com>
*/
-#include "config.h"
-
#include <assert.h>
#include <string.h>
#include <stdint.h>
diff --git a/lib/igt_eld.c b/lib/igt_eld.c
index ef6625df..ece2d304 100644
--- a/lib/igt_eld.c
+++ b/lib/igt_eld.c
@@ -23,12 +23,8 @@
* Authors: Simon Ser <simon.ser@intel.com>
*/
-#include "config.h"
-
#include <dirent.h>
-#include <errno.h>
#include <glob.h>
-#include <stdint.h>
#include <stdio.h>
#include <string.h>
diff --git a/lib/igt_frame.c b/lib/igt_frame.c
index 45523a79..2a41b9c6 100644
--- a/lib/igt_frame.c
+++ b/lib/igt_frame.c
@@ -24,8 +24,6 @@
* Paul Kocialkowski <paul.kocialkowski@linux.intel.com>
*/
-#include "config.h"
-
#include <fcntl.h>
#include <pixman.h>
#include <cairo.h>
diff --git a/lib/igt_gt.c b/lib/igt_gt.c
index 50da512f..6b3103fe 100644
--- a/lib/igt_gt.c
+++ b/lib/igt_gt.c
@@ -26,14 +26,10 @@
#include <strings.h>
#include <signal.h>
#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <fcntl.h>
#include "drmtest.h"
#include "i915/gem.h"
-#include "i915/gem_engine_topology.h"
#include "igt_aux.h"
#include "igt_core.h"
#include "igt_gt.h"
@@ -41,7 +37,6 @@
#include "igt_sysfs.h"
#include "igt_debugfs.h"
#include "ioctl_wrappers.h"
-#include "intel_reg.h"
#include "intel_chipset.h"
#include "igt_dummyload.h"
diff --git a/lib/igt_infoframe.c b/lib/igt_infoframe.c
index 2e14fe70..618b33e4 100644
--- a/lib/igt_infoframe.c
+++ b/lib/igt_infoframe.c
@@ -23,8 +23,6 @@
* Authors: Simon Ser <simon.ser@intel.com>
*/
-#include "config.h"
-
#include <string.h>
#include "igt_core.h"
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index a25fac74..12384eec 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -34,7 +34,6 @@
#include <stdio.h>
#include <stdarg.h>
#include <fcntl.h>
-#include <sys/stat.h>
#include <string.h>
#include <stdlib.h>
#ifdef HAVE_LINUX_KD_H
@@ -54,11 +53,9 @@
#include "igt_kms.h"
#include "igt_aux.h"
#include "igt_edid.h"
-#include "intel_chipset.h"
#include "igt_debugfs.h"
#include "igt_device.h"
#include "igt_sysfs.h"
-#include "sw_sync.h"
#ifdef HAVE_CHAMELIUM
#include "igt_chamelium.h"
#endif
diff --git a/lib/igt_msm.c b/lib/igt_msm.c
index e9cf588f..6841d1e0 100644
--- a/lib/igt_msm.c
+++ b/lib/igt_msm.c
@@ -26,13 +26,10 @@
#include <signal.h>
#include <errno.h>
#include <sys/mman.h>
-#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
-#include <fcntl.h>
#include "drmtest.h"
-#include "igt_aux.h"
#include "igt_core.h"
#include "igt_msm.h"
#include "ioctl_wrappers.h"
diff --git a/lib/igt_nouveau.c b/lib/igt_nouveau.c
index fdf6020a..0a1326e9 100644
--- a/lib/igt_nouveau.c
+++ b/lib/igt_nouveau.c
@@ -32,7 +32,6 @@
#include "igt_nouveau.h"
#include "nouveau/nvif/push.h"
-#include "nouveau/nvhw/class/cla0b5.h"
#include "nouveau/priv.h"
#define PASCAL_DMA_COPY_A (0x0000C0B5)
diff --git a/lib/igt_panfrost.c b/lib/igt_panfrost.c
index f63611b9..e331ed82 100644
--- a/lib/igt_panfrost.c
+++ b/lib/igt_panfrost.c
@@ -22,22 +22,15 @@
* IN THE SOFTWARE.
*/
-#include <assert.h>
#include <string.h>
-#include <signal.h>
+#include <stddef.h>
#include <errno.h>
#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
#include "drmtest.h"
-#include "igt_aux.h"
#include "igt_core.h"
#include "igt_panfrost.h"
#include "ioctl_wrappers.h"
-#include "intel_reg.h"
#include "intel_chipset.h"
#include "panfrost_drm.h"
#include "panfrost-job.h"
diff --git a/lib/igt_params.c b/lib/igt_params.c
index 3dad317a..f3a985c5 100644
--- a/lib/igt_params.c
+++ b/lib/igt_params.c
@@ -27,7 +27,6 @@
#include <stdbool.h>
#include <stdio.h>
#include <sys/ioctl.h>
-#include <sys/stat.h>
#include <i915_drm.h>
diff --git a/lib/igt_pm.c b/lib/igt_pm.c
index 6ebbad33..d453b5e6 100644
--- a/lib/igt_pm.c
+++ b/lib/igt_pm.c
@@ -34,7 +34,6 @@
#include <unistd.h>
#include <sys/stat.h>
#include <sys/sysmacros.h>
-#include <sys/types.h>
#include <dirent.h>
#include "drmtest.h"
diff --git a/lib/igt_primes.c b/lib/igt_primes.c
index 3941bb21..10671d31 100644
--- a/lib/igt_primes.c
+++ b/lib/igt_primes.c
@@ -24,7 +24,6 @@
#include "igt_primes.h"
#include <stdlib.h>
-#include <stdbool.h>
#include <string.h>
#include <math.h>
diff --git a/lib/igt_rapl.c b/lib/igt_rapl.c
index 03e49226..fb1b75c1 100644
--- a/lib/igt_rapl.c
+++ b/lib/igt_rapl.c
@@ -1,4 +1,3 @@
-#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
#include <locale.h>
diff --git a/lib/igt_sysfs.c b/lib/igt_sysfs.c
index 40c9a2e3..857773e8 100644
--- a/lib/igt_sysfs.c
+++ b/lib/igt_sysfs.c
@@ -25,7 +25,6 @@
#include <inttypes.h>
#include <sys/stat.h>
#include <sys/sysmacros.h>
-#include <sys/mount.h>
#include <errno.h>
#include <stdarg.h>
#include <stdio.h>
@@ -34,14 +33,10 @@
#include <string.h>
#include <fcntl.h>
#include <unistd.h>
-#include <i915_drm.h>
#include <dirent.h>
-#include <unistd.h>
-#include <fcntl.h>
#include "igt_core.h"
#include "igt_sysfs.h"
-#include "igt_device.h"
#include "igt_io.h"
/**
diff --git a/lib/igt_thread.c b/lib/igt_thread.c
index 5bdda410..06ea72b3 100644
--- a/lib/igt_thread.c
+++ b/lib/igt_thread.c
@@ -22,8 +22,6 @@
*/
#include <pthread.h>
-#include <stdlib.h>
-#include <stdatomic.h>
#include "igt_core.h"
#include "igt_thread.h"
diff --git a/lib/igt_v3d.c b/lib/igt_v3d.c
index 619c072c..88ec75f6 100644
--- a/lib/igt_v3d.c
+++ b/lib/igt_v3d.c
@@ -21,22 +21,14 @@
* IN THE SOFTWARE.
*/
-#include <assert.h>
#include <string.h>
-#include <signal.h>
#include <errno.h>
#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
#include "drmtest.h"
-#include "igt_aux.h"
#include "igt_core.h"
#include "igt_v3d.h"
#include "ioctl_wrappers.h"
-#include "intel_reg.h"
#include "intel_chipset.h"
#include "v3d_drm.h"
diff --git a/lib/igt_vc4.c b/lib/igt_vc4.c
index 4415fa32..e3f76765 100644
--- a/lib/igt_vc4.c
+++ b/lib/igt_vc4.c
@@ -23,21 +23,14 @@
#include <assert.h>
#include <string.h>
-#include <signal.h>
#include <errno.h>
#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
#include "drmtest.h"
-#include "igt_aux.h"
#include "igt_core.h"
#include "igt_fb.h"
#include "igt_vc4.h"
#include "ioctl_wrappers.h"
-#include "intel_reg.h"
#include "intel_chipset.h"
#include "vc4_drm.h"
#include "vc4_packet.h"
diff --git a/lib/igt_x86.c b/lib/igt_x86.c
index 6ac700df..4dce3be5 100644
--- a/lib/igt_x86.c
+++ b/lib/igt_x86.c
@@ -38,7 +38,6 @@
#include "igt_x86.h"
#include "igt_aux.h"
-#include <stdint.h>
#include <stdio.h>
#include <string.h>
diff --git a/lib/instdone.c b/lib/instdone.c
index a83f8836..d3d8d8e7 100644
--- a/lib/instdone.c
+++ b/lib/instdone.c
@@ -25,7 +25,6 @@
*
*/
-#include <assert.h>
#include "instdone.h"
#include "intel_chipset.h"
diff --git a/lib/intel_allocator_msgchannel.c b/lib/intel_allocator_msgchannel.c
index cd0f0a5d..d1f6486c 100644
--- a/lib/intel_allocator_msgchannel.c
+++ b/lib/intel_allocator_msgchannel.c
@@ -6,7 +6,6 @@
#include <sys/types.h>
#include <sys/ipc.h>
#include <sys/msg.h>
-#include <sys/stat.h>
#include <fcntl.h>
#include "igt.h"
#include "intel_allocator_msgchannel.h"
diff --git a/lib/intel_allocator_random.c b/lib/intel_allocator_random.c
index d22f8176..9ed92383 100644
--- a/lib/intel_allocator_random.c
+++ b/lib/intel_allocator_random.c
@@ -3,10 +3,8 @@
* Copyright © 2021 Intel Corporation
*/
-#include <sys/ioctl.h>
#include <stdlib.h>
#include "igt.h"
-#include "igt_x86.h"
#include "igt_rand.h"
#include "intel_allocator.h"
diff --git a/lib/intel_allocator_reloc.c b/lib/intel_allocator_reloc.c
index ee3ad43f..bf4d9c43 100644
--- a/lib/intel_allocator_reloc.c
+++ b/lib/intel_allocator_reloc.c
@@ -3,10 +3,8 @@
* Copyright © 2021 Intel Corporation
*/
-#include <sys/ioctl.h>
#include <stdlib.h>
#include "igt.h"
-#include "igt_x86.h"
#include "igt_rand.h"
#include "intel_allocator.h"
diff --git a/lib/intel_allocator_simple.c b/lib/intel_allocator_simple.c
index 8d5105f1..22828ae5 100644
--- a/lib/intel_allocator_simple.c
+++ b/lib/intel_allocator_simple.c
@@ -3,10 +3,7 @@
* Copyright © 2021 Intel Corporation
*/
-#include <sys/ioctl.h>
#include <stdlib.h>
-#include "igt.h"
-#include "igt_x86.h"
#include "intel_allocator.h"
#include "intel_bufops.h"
#include "igt_map.h"
diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c
index 36cb5504..f3672dea 100644
--- a/lib/intel_batchbuffer.c
+++ b/lib/intel_batchbuffer.c
@@ -26,14 +26,11 @@
**************************************************************************/
#include <inttypes.h>
-#include <poll.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <assert.h>
#include <search.h>
-#include "drm.h"
#include "drmtest.h"
#include "i915/gem_create.h"
#include "intel_batchbuffer.h"
diff --git a/lib/intel_chipset.c b/lib/intel_chipset.c
index efb6f177..438961c1 100644
--- a/lib/intel_chipset.c
+++ b/lib/intel_chipset.c
@@ -25,17 +25,10 @@
*
*/
-#include <unistd.h>
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <errno.h>
#include <err.h>
-#include <assert.h>
#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
#include "i915_drm.h"
#include "drmtest.h"
diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
index 0253a732..14bcd484 100644
--- a/lib/intel_device_info.c
+++ b/lib/intel_device_info.c
@@ -2,8 +2,6 @@
#include "i915_pciids.h"
#include "i915_pciids_local.h"
-#include <strings.h> /* ffs() */
-
static const struct intel_device_info intel_generic_info = {
.graphics_ver = 0,
.display_ver = 0,
diff --git a/lib/intel_iosf.c b/lib/intel_iosf.c
index 40525b06..3e0a33de 100644
--- a/lib/intel_iosf.c
+++ b/lib/intel_iosf.c
@@ -1,7 +1,4 @@
#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <err.h>
#include <errno.h>
#include "intel_io.h"
diff --git a/lib/intel_mmio.c b/lib/intel_mmio.c
index 10b07aab..29ae898b 100644
--- a/lib/intel_mmio.c
+++ b/lib/intel_mmio.c
@@ -28,16 +28,9 @@
#include <unistd.h>
#include <fcntl.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <errno.h>
-#include <err.h>
-#include <assert.h>
-#include <sys/ioctl.h>
#include <sys/stat.h>
#include <sys/mman.h>
diff --git a/lib/intel_os.c b/lib/intel_os.c
index 2bb0c981..e7be973a 100644
--- a/lib/intel_os.c
+++ b/lib/intel_os.c
@@ -34,11 +34,7 @@
#include <stdio.h>
#include <string.h>
#include <errno.h>
-#include <err.h>
-#include <assert.h>
-#include <sys/ioctl.h>
#include <fcntl.h>
-#include <sys/stat.h>
#include <sys/mman.h>
#ifdef HAVE_STRUCT_SYSINFO_TOTALRAM
#include <sys/sysinfo.h>
@@ -47,7 +43,6 @@
#endif
#include <sys/resource.h>
-#include "intel_io.h"
#include "drmtest.h"
#include "igt_aux.h"
#include "igt_debugfs.h"
diff --git a/lib/intel_reg_map.c b/lib/intel_reg_map.c
index 0e2ee06c..882ae16d 100644
--- a/lib/intel_reg_map.c
+++ b/lib/intel_reg_map.c
@@ -26,9 +26,6 @@
*/
#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <sys/types.h>
#include "intel_io.h"
#include "intel_chipset.h"
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index 09eb3ce7..dfb32686 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -26,25 +26,12 @@
*
*/
-#ifdef HAVE_LIBGEN_H
-#include <libgen.h>
-#endif
#include <stdio.h>
#include <fcntl.h>
-#include <sys/stat.h>
#include <sys/ioctl.h>
#include <string.h>
#include <sys/mman.h>
-#include <signal.h>
-#include <pciaccess.h>
-#include <getopt.h>
-#include <stdlib.h>
#include <unistd.h>
-#include <sys/wait.h>
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <sys/utsname.h>
-#include <termios.h>
#include <errno.h>
#include "drmtest.h"
@@ -52,8 +39,6 @@
#include "i915/gem_create.h"
#include "intel_batchbuffer.h"
#include "intel_chipset.h"
-#include "intel_io.h"
-#include "igt_debugfs.h"
#include "igt_sysfs.h"
#include "igt_x86.h"
#include "config.h"
diff --git a/lib/media_fill.c b/lib/media_fill.c
index d758f1f5..b910f8a9 100644
--- a/lib/media_fill.c
+++ b/lib/media_fill.c
@@ -30,7 +30,6 @@
#include "intel_reg.h"
#include "drmtest.h"
#include "gpu_cmds.h"
-#include <assert.h>
static const uint32_t gen7_media_kernel[][4] = {
{ 0x00400001, 0x20200231, 0x00000020, 0x00000000 },
diff --git a/lib/media_spin.c b/lib/media_spin.c
index d2345d15..7bbee0f2 100644
--- a/lib/media_spin.c
+++ b/lib/media_spin.c
@@ -26,7 +26,6 @@
#include <i915_drm.h>
#include "intel_reg.h"
-#include "drmtest.h"
#include "intel_batchbuffer.h"
#include "intel_chipset.h"
#include "media_spin.h"
diff --git a/lib/nouveau/cea0b5.c b/lib/nouveau/cea0b5.c
index 0986a3f8..2df80b05 100644
--- a/lib/nouveau/cea0b5.c
+++ b/lib/nouveau/cea0b5.c
@@ -22,8 +22,6 @@
#include <inttypes.h>
-#include <nouveau_drm.h>
-
#include "igt.h"
#include "igt_nouveau.h"
diff --git a/lib/rendercopy_gen6.c b/lib/rendercopy_gen6.c
index e941257e..940f5638 100644
--- a/lib/rendercopy_gen6.c
+++ b/lib/rendercopy_gen6.c
@@ -1,15 +1,5 @@
-#include <assert.h>
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <stdio.h>
#include <string.h>
-#include <assert.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include "drm.h"
#include "i915_drm.h"
#include "drmtest.h"
#include "intel_bufops.h"
@@ -17,7 +7,6 @@
#include "intel_io.h"
#include "rendercopy.h"
#include "gen6_render.h"
-#include "intel_reg.h"
#define VERTEX_SIZE (3*4)
diff --git a/lib/rendercopy_gen7.c b/lib/rendercopy_gen7.c
index 267f6f80..903de9f2 100644
--- a/lib/rendercopy_gen7.c
+++ b/lib/rendercopy_gen7.c
@@ -1,15 +1,5 @@
-#include <assert.h>
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <stdio.h>
#include <string.h>
-#include <assert.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include "drm.h"
#include "i915_drm.h"
#include "drmtest.h"
#include "intel_bufops.h"
@@ -18,7 +8,6 @@
#include "intel_chipset.h"
#include "rendercopy.h"
#include "gen7_render.h"
-#include "intel_reg.h"
#if DEBUG_RENDERCPY
static void dump_batch(struct intel_bb *ibb)
diff --git a/lib/rendercopy_gen8.c b/lib/rendercopy_gen8.c
index ba7897fb..948e721b 100644
--- a/lib/rendercopy_gen8.c
+++ b/lib/rendercopy_gen8.c
@@ -1,26 +1,13 @@
-#include <assert.h>
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <stdio.h>
#include <string.h>
-#include <assert.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <drm.h>
#include <i915_drm.h>
-#include "drmtest.h"
#include "intel_bufops.h"
#include "intel_batchbuffer.h"
#include "intel_chipset.h"
-#include "intel_io.h"
#include "rendercopy.h"
#include "gen8_render.h"
-#include "intel_reg.h"
#include "igt_aux.h"
#define VERTEX_SIZE (3*4)
diff --git a/lib/rendercopy_gen9.c b/lib/rendercopy_gen9.c
index ae0f775a..9d55613e 100644
--- a/lib/rendercopy_gen9.c
+++ b/lib/rendercopy_gen9.c
@@ -1,24 +1,11 @@
-#include <assert.h>
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <stdio.h>
#include <string.h>
-#include <assert.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <getopt.h>
-#include <drm.h>
#include <i915_drm.h>
-#include "drmtest.h"
#include "intel_aux_pgtable.h"
#include "intel_bufops.h"
#include "intel_batchbuffer.h"
-#include "intel_io.h"
#include "rendercopy.h"
#include "gen9_render.h"
#include "intel_reg.h"
diff --git a/lib/rendercopy_i830.c b/lib/rendercopy_i830.c
index 4c427149..1f621872 100644
--- a/lib/rendercopy_i830.c
+++ b/lib/rendercopy_i830.c
@@ -1,14 +1,5 @@
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <stdio.h>
#include <string.h>
-#include <assert.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include "drm.h"
#include "i915_drm.h"
#include "drmtest.h"
#include "intel_bufops.h"
diff --git a/lib/rendercopy_i915.c b/lib/rendercopy_i915.c
index 3e421301..4adddee6 100644
--- a/lib/rendercopy_i915.c
+++ b/lib/rendercopy_i915.c
@@ -1,14 +1,5 @@
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <stdio.h>
#include <string.h>
-#include <assert.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include "drm.h"
#include "i915_drm.h"
#include "drmtest.h"
#include "intel_bufops.h"
diff --git a/lib/sw_sync.c b/lib/sw_sync.c
index 6c762c8b..cbadff4b 100644
--- a/lib/sw_sync.c
+++ b/lib/sw_sync.c
@@ -24,9 +24,6 @@
* Robert Foss <robert.foss@collabora.com>
*/
-#ifdef HAVE_LIBGEN_H
-#include <libgen.h>
-#endif
#include <fcntl.h>
#include <poll.h>
#include <stdbool.h>
diff --git a/lib/tests/igt_assert.c b/lib/tests/igt_assert.c
index 3523a464..9d794655 100644
--- a/lib/tests/igt_assert.c
+++ b/lib/tests/igt_assert.c
@@ -22,7 +22,6 @@
*
*/
-#include <errno.h>
#include <float.h>
#include <limits.h>
#include <math.h>
@@ -30,8 +29,6 @@
#include <stdint.h>
#include <stdlib.h>
#include <unistd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
#include "igt_core.h"
#include "drmtest.h"
diff --git a/lib/tests/igt_audio.c b/lib/tests/igt_audio.c
index c0727673..64649772 100644
--- a/lib/tests/igt_audio.c
+++ b/lib/tests/igt_audio.c
@@ -23,8 +23,6 @@
* Author: Simon Ser <simon.ser@intel.com>
*/
-#include "config.h"
-
#include <stdlib.h>
#include "igt_core.h"
diff --git a/lib/tests/igt_conflicting_args.c b/lib/tests/igt_conflicting_args.c
index b5fe2d78..073d5717 100644
--- a/lib/tests/igt_conflicting_args.c
+++ b/lib/tests/igt_conflicting_args.c
@@ -27,8 +27,6 @@
*/
#include <signal.h>
-#include <sys/wait.h>
-#include <errno.h>
#include "drmtest.h"
#include "igt_core.h"
diff --git a/lib/tests/igt_describe.c b/lib/tests/igt_describe.c
index d71e051e..1b35a353 100644
--- a/lib/tests/igt_describe.c
+++ b/lib/tests/igt_describe.c
@@ -23,7 +23,6 @@
#include <sys/wait.h>
#include <string.h>
-#include <stdlib.h>
#include "drmtest.h"
#include "igt_tests_common.h"
diff --git a/lib/tests/igt_dynamic_subtests.c b/lib/tests/igt_dynamic_subtests.c
index b18cfae6..a1840317 100644
--- a/lib/tests/igt_dynamic_subtests.c
+++ b/lib/tests/igt_dynamic_subtests.c
@@ -21,7 +21,6 @@
* IN THE SOFTWARE.
*/
-#include <errno.h>
#include <sys/wait.h>
#include "igt_core.h"
diff --git a/lib/tests/igt_edid.c b/lib/tests/igt_edid.c
index 8474d29e..0bfead87 100644
--- a/lib/tests/igt_edid.c
+++ b/lib/tests/igt_edid.c
@@ -23,8 +23,6 @@
* Authors: Simon Ser <simon.ser@intel.com>
*/
-#include "config.h"
-
#include <stdbool.h>
#include "igt_core.h"
diff --git a/lib/tests/igt_exit_handler.c b/lib/tests/igt_exit_handler.c
index 892a7f14..1e00e8ec 100644
--- a/lib/tests/igt_exit_handler.c
+++ b/lib/tests/igt_exit_handler.c
@@ -23,7 +23,6 @@
#include <unistd.h>
#include <fcntl.h>
-#include <sys/types.h>
#include <sys/wait.h>
#include "igt_core.h"
#include "drmtest.h"
diff --git a/lib/tests/igt_fork.c b/lib/tests/igt_fork.c
index d19d0945..d9d0e316 100644
--- a/lib/tests/igt_fork.c
+++ b/lib/tests/igt_fork.c
@@ -23,7 +23,6 @@
*/
#include <errno.h>
-#include <stdint.h>
#include <stdlib.h>
#include <unistd.h>
#include <sys/types.h>
diff --git a/lib/tests/igt_fork_helper.c b/lib/tests/igt_fork_helper.c
index b4cf27eb..57584e18 100644
--- a/lib/tests/igt_fork_helper.c
+++ b/lib/tests/igt_fork_helper.c
@@ -25,7 +25,6 @@
*
*/
-#include "drmtest.h"
#include "igt_aux.h"
int main(int argc, char **argv)
diff --git a/lib/tests/igt_invalid_subtest_name.c b/lib/tests/igt_invalid_subtest_name.c
index b790482c..2891e7eb 100644
--- a/lib/tests/igt_invalid_subtest_name.c
+++ b/lib/tests/igt_invalid_subtest_name.c
@@ -21,7 +21,6 @@
* IN THE SOFTWARE.
*/
-#include <errno.h>
#include <sys/wait.h>
#include "igt_core.h"
diff --git a/lib/tests/igt_segfault.c b/lib/tests/igt_segfault.c
index 56efa912..8c00a0c1 100644
--- a/lib/tests/igt_segfault.c
+++ b/lib/tests/igt_segfault.c
@@ -35,10 +35,7 @@
*/
#include <signal.h>
-#include <stdlib.h>
-#include <sys/wait.h>
#include <sys/types.h>
-#include <errno.h>
#include "drmtest.h"
#include "igt_core.h"
diff --git a/lib/tests/igt_simulation.c b/lib/tests/igt_simulation.c
index 9a2cf2aa..bad917c1 100644
--- a/lib/tests/igt_simulation.c
+++ b/lib/tests/igt_simulation.c
@@ -26,11 +26,8 @@
*/
#include <stdlib.h>
-#include <sys/wait.h>
#include <sys/types.h>
-#include <errno.h>
-#include "drmtest.h"
#include "igt_core.h"
#include "igt_tests_common.h"
diff --git a/lib/veboxcopy_gen12.c b/lib/veboxcopy_gen12.c
index aa90939b..38878e49 100644
--- a/lib/veboxcopy_gen12.c
+++ b/lib/veboxcopy_gen12.c
@@ -20,7 +20,6 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
-#include <drm.h>
#include "igt.h"
#include "intel_aux_pgtable.h"
--
2.36.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [igt-dev] [PATCH i-g-t 02/14] assembler: Remove unused headers
2022-05-31 14:28 [igt-dev] [PATCH i-g-t 01/14] lib: Remove unused headers Ryszard Knop
@ 2022-05-31 14:28 ` Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 03/14] benchmarks: " Ryszard Knop
` (11 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Ryszard Knop @ 2022-05-31 14:28 UTC (permalink / raw)
To: Development mailing list for IGT GPU Tools
Using CLion's automated code inspection, most unused includes were found
and removed. Some warnings remain as CLion is unable to track code usage
across certain attributes, but the vast majority of unneeded headers are
now gone.
Signed-off-by: Ryszard Knop <ryszard.knop@intel.com>
---
assembler/brw_disasm.c | 3 ---
assembler/brw_eu_util.c | 1 -
assembler/disasm-main.c | 1 -
assembler/gen8_disasm.c | 3 ---
4 files changed, 8 deletions(-)
diff --git a/assembler/brw_disasm.c b/assembler/brw_disasm.c
index 4dec829f..a804c655 100644
--- a/assembler/brw_disasm.c
+++ b/assembler/brw_disasm.c
@@ -21,10 +21,7 @@
*/
#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
-#include <getopt.h>
-#include <unistd.h>
#include <stdarg.h>
#include "brw_compat.h"
diff --git a/assembler/brw_eu_util.c b/assembler/brw_eu_util.c
index f9126abf..2014b093 100644
--- a/assembler/brw_eu_util.c
+++ b/assembler/brw_eu_util.c
@@ -30,7 +30,6 @@
*/
-#include "brw_context.h"
#include "brw_defines.h"
#include "brw_eu.h"
diff --git a/assembler/disasm-main.c b/assembler/disasm-main.c
index b3655568..a5969bbb 100644
--- a/assembler/disasm-main.c
+++ b/assembler/disasm-main.c
@@ -24,7 +24,6 @@
#include <stdlib.h>
#include <string.h>
#include <getopt.h>
-#include <unistd.h>
#include "gen4asm.h"
#include "brw_eu.h"
diff --git a/assembler/gen8_disasm.c b/assembler/gen8_disasm.c
index 99b062ea..8ffe947a 100644
--- a/assembler/gen8_disasm.c
+++ b/assembler/gen8_disasm.c
@@ -21,10 +21,7 @@
*/
#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
-#include <getopt.h>
-#include <unistd.h>
#include <stdarg.h>
#include "brw_context.h"
--
2.36.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [igt-dev] [PATCH i-g-t 03/14] benchmarks: Remove unused headers
2022-05-31 14:28 [igt-dev] [PATCH i-g-t 01/14] lib: Remove unused headers Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 02/14] assembler: " Ryszard Knop
@ 2022-05-31 14:28 ` Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 04/14] overlay: " Ryszard Knop
` (10 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Ryszard Knop @ 2022-05-31 14:28 UTC (permalink / raw)
To: Development mailing list for IGT GPU Tools
Using CLion's automated code inspection, most unused includes were found
and removed. Some warnings remain as CLion is unable to track code usage
across certain attributes, but the vast majority of unneeded headers are
now gone.
Signed-off-by: Ryszard Knop <ryszard.knop@intel.com>
---
benchmarks/gem_blt.c | 5 -----
benchmarks/gem_busy.c | 5 -----
benchmarks/gem_create.c | 6 ------
benchmarks/gem_exec_ctx.c | 7 -------
benchmarks/gem_exec_fault.c | 7 -------
benchmarks/gem_exec_nop.c | 8 --------
benchmarks/gem_exec_reloc.c | 6 ------
benchmarks/gem_exec_trace.c | 5 -----
benchmarks/gem_exec_tracer.c | 6 ------
benchmarks/gem_latency.c | 7 -------
benchmarks/gem_prw.c | 7 -------
benchmarks/gem_set_domain.c | 8 --------
benchmarks/gem_syslatency.c | 6 ------
benchmarks/gem_userptr_benchmark.c | 8 --------
benchmarks/gem_wsim.c | 6 ------
benchmarks/intel_upload_blit_large.c | 6 ------
benchmarks/intel_upload_blit_large_gtt.c | 5 -----
benchmarks/intel_upload_blit_large_map.c | 5 -----
benchmarks/intel_upload_blit_small.c | 4 ----
benchmarks/kms_vblank.c | 5 -----
benchmarks/prime_lookup.c | 6 ------
benchmarks/vgem_mmap.c | 5 -----
22 files changed, 133 deletions(-)
diff --git a/benchmarks/gem_blt.c b/benchmarks/gem_blt.c
index 424ce8e7..6cf0490d 100644
--- a/benchmarks/gem_blt.c
+++ b/benchmarks/gem_blt.c
@@ -31,12 +31,7 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
#include <math.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <sys/time.h>
#include <time.h>
diff --git a/benchmarks/gem_busy.c b/benchmarks/gem_busy.c
index 514e3387..22523f14 100644
--- a/benchmarks/gem_busy.c
+++ b/benchmarks/gem_busy.c
@@ -30,13 +30,9 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
#include <sys/poll.h>
#include <sys/ioctl.h>
-#include <sys/time.h>
#include <time.h>
#include "drm.h"
@@ -44,7 +40,6 @@
#include "drmtest.h"
#include "intel_chipset.h"
#include "intel_reg.h"
-#include "igt_stats.h"
#include "i915/gem_create.h"
#include "i915/gem_mman.h"
diff --git a/benchmarks/gem_create.c b/benchmarks/gem_create.c
index 7808f43a..ef9251a9 100644
--- a/benchmarks/gem_create.c
+++ b/benchmarks/gem_create.c
@@ -30,15 +30,9 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <sys/time.h>
#include <time.h>
-#include "drm.h"
#include "drmtest.h"
#include "i915/gem_create.h"
#include "igt_aux.h"
diff --git a/benchmarks/gem_exec_ctx.c b/benchmarks/gem_exec_ctx.c
index b0c62e4c..58032b85 100644
--- a/benchmarks/gem_exec_ctx.c
+++ b/benchmarks/gem_exec_ctx.c
@@ -30,20 +30,13 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <sys/time.h>
#include <time.h>
#include "drm.h"
#include "drmtest.h"
#include "i915/gem_create.h"
-#include "intel_io.h"
#include "intel_reg.h"
-#include "igt_stats.h"
#include "ioctl_wrappers.h"
enum mode { NOP, CREATE, SWITCH, DEFAULT };
diff --git a/benchmarks/gem_exec_fault.c b/benchmarks/gem_exec_fault.c
index e0484071..03a7fcb1 100644
--- a/benchmarks/gem_exec_fault.c
+++ b/benchmarks/gem_exec_fault.c
@@ -32,19 +32,12 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <sys/time.h>
#include <time.h>
-#include "drm.h"
#include "drmtest.h"
#include "i915/gem_create.h"
#include "i915/gem_submission.h"
-#include "igt_stats.h"
#include "intel_allocator.h"
#include "intel_io.h"
#include "intel_reg.h"
diff --git a/benchmarks/gem_exec_nop.c b/benchmarks/gem_exec_nop.c
index 9f8634a7..583f3470 100644
--- a/benchmarks/gem_exec_nop.c
+++ b/benchmarks/gem_exec_nop.c
@@ -30,19 +30,11 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <sys/time.h>
#include <time.h>
-#include "drm.h"
#include "drmtest.h"
#include "i915/gem_create.h"
-#include "igt_stats.h"
-#include "intel_io.h"
#include "intel_reg.h"
#include "ioctl_wrappers.h"
diff --git a/benchmarks/gem_exec_reloc.c b/benchmarks/gem_exec_reloc.c
index dadc064f..912775b9 100644
--- a/benchmarks/gem_exec_reloc.c
+++ b/benchmarks/gem_exec_reloc.c
@@ -30,17 +30,11 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
#include <sys/time.h>
-#include "drm.h"
#include "drmtest.h"
#include "i915/gem_create.h"
#include "i915/gem_mman.h"
-#include "igt_debugfs.h"
#include "intel_reg.h"
#include "ioctl_wrappers.h"
diff --git a/benchmarks/gem_exec_trace.c b/benchmarks/gem_exec_trace.c
index 4263ccb0..2a970491 100644
--- a/benchmarks/gem_exec_trace.c
+++ b/benchmarks/gem_exec_trace.c
@@ -31,10 +31,7 @@
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <sys/time.h>
#include <time.h>
#include <assert.h>
@@ -42,8 +39,6 @@
#include "drm.h"
#include "drmtest.h"
#include "i915/gem_create.h"
-#include "igt_stats.h"
-#include "intel_io.h"
#include "ioctl_wrappers.h"
enum {
diff --git a/benchmarks/gem_exec_tracer.c b/benchmarks/gem_exec_tracer.c
index e6973991..70bbc9bf 100644
--- a/benchmarks/gem_exec_tracer.c
+++ b/benchmarks/gem_exec_tracer.c
@@ -25,22 +25,16 @@
#include <stdio.h>
#include <string.h>
#include <stdint.h>
-#include <stdbool.h>
#include <stdarg.h>
#include <fcntl.h>
#include <sys/types.h>
-#include <sys/stat.h>
#include <sys/ioctl.h>
#include <unistd.h>
#include <errno.h>
-#include <sys/mman.h>
#include <dlfcn.h>
#include <i915_drm.h>
#include <pthread.h>
-#include "intel_aub.h"
-#include "intel_chipset.h"
-
static int (*libc_close)(int fd);
static int (*libc_ioctl)(int fd, unsigned long request, void *argp);
diff --git a/benchmarks/gem_latency.c b/benchmarks/gem_latency.c
index cc8b3de5..7edc33e9 100644
--- a/benchmarks/gem_latency.c
+++ b/benchmarks/gem_latency.c
@@ -32,17 +32,10 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
#include <limits.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
#include <sys/poll.h>
#include <sys/resource.h>
-#include "drm.h"
#include "i915/gem_create.h"
#include "igt.h"
#include "igt_device.h"
diff --git a/benchmarks/gem_prw.c b/benchmarks/gem_prw.c
index c6f3e066..ae00c022 100644
--- a/benchmarks/gem_prw.c
+++ b/benchmarks/gem_prw.c
@@ -30,18 +30,11 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <sys/time.h>
#include <time.h>
-#include "drm.h"
#include "drmtest.h"
#include "i915/gem_create.h"
-#include "igt_aux.h"
#include "igt_stats.h"
#include "ioctl_wrappers.h"
diff --git a/benchmarks/gem_set_domain.c b/benchmarks/gem_set_domain.c
index c92beea4..373aaf0e 100644
--- a/benchmarks/gem_set_domain.c
+++ b/benchmarks/gem_set_domain.c
@@ -29,19 +29,11 @@
#include <stdlib.h>
#include <stdint.h>
#include <stdio.h>
-#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <sys/time.h>
#include <time.h>
-#include "drm.h"
#include "drmtest.h"
#include "i915/gem_create.h"
-#include "igt_aux.h"
#include "ioctl_wrappers.h"
static double elapsed(const struct timespec *start,
diff --git a/benchmarks/gem_syslatency.c b/benchmarks/gem_syslatency.c
index 035ee934..2fe85ee0 100644
--- a/benchmarks/gem_syslatency.c
+++ b/benchmarks/gem_syslatency.c
@@ -30,19 +30,13 @@
#include <string.h>
#include <fcntl.h>
#include <ftw.h>
-#include <inttypes.h>
#include <pthread.h>
#include <sched.h>
#include <signal.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <sys/time.h>
#include <time.h>
#include <limits.h>
-#include "drm.h"
-
-#include <linux/unistd.h>
#include "i915/gem_create.h"
#include "i915/gem_ring.h"
diff --git a/benchmarks/gem_userptr_benchmark.c b/benchmarks/gem_userptr_benchmark.c
index 3b589432..3ea24d5c 100644
--- a/benchmarks/gem_userptr_benchmark.c
+++ b/benchmarks/gem_userptr_benchmark.c
@@ -35,21 +35,13 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
#include <assert.h>
-#include <sys/stat.h>
-#include <sys/time.h>
#include <sys/mman.h>
#include <signal.h>
-#include "drm.h"
-#include "i915_drm.h"
-
#include "drmtest.h"
-#include "intel_batchbuffer.h"
-#include "intel_chipset.h"
#include "ioctl_wrappers.h"
#include "igt_aux.h"
diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c
index d1435222..41df0469 100644
--- a/benchmarks/gem_wsim.c
+++ b/benchmarks/gem_wsim.c
@@ -29,16 +29,12 @@
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
-#include <inttypes.h>
#include <errno.h>
#include <poll.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/wait.h>
#include <time.h>
-#include <assert.h>
#include <limits.h>
#include <pthread.h>
#include <math.h>
@@ -50,10 +46,8 @@
#include "intel_reg.h"
#include "ioctl_wrappers.h"
-#include "intel_io.h"
#include "igt_aux.h"
#include "igt_rand.h"
-#include "igt_perf.h"
#include "sw_sync.h"
#include "i915/gem_create.h"
diff --git a/benchmarks/intel_upload_blit_large.c b/benchmarks/intel_upload_blit_large.c
index 12bbae3d..23c48223 100644
--- a/benchmarks/intel_upload_blit_large.c
+++ b/benchmarks/intel_upload_blit_large.c
@@ -45,17 +45,11 @@
*/
#include "igt.h"
-#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <assert.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
#include <sys/time.h>
-#include <drm.h>
#include <i915_drm.h>
#define OBJECT_WIDTH 1280
diff --git a/benchmarks/intel_upload_blit_large_gtt.c b/benchmarks/intel_upload_blit_large_gtt.c
index 0b704b57..8fd82b9e 100644
--- a/benchmarks/intel_upload_blit_large_gtt.c
+++ b/benchmarks/intel_upload_blit_large_gtt.c
@@ -45,14 +45,9 @@
*/
#include "igt.h"
-#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <assert.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
#include <sys/time.h>
#define OBJECT_WIDTH 1280
diff --git a/benchmarks/intel_upload_blit_large_map.c b/benchmarks/intel_upload_blit_large_map.c
index ae05434f..11f19469 100644
--- a/benchmarks/intel_upload_blit_large_map.c
+++ b/benchmarks/intel_upload_blit_large_map.c
@@ -48,14 +48,9 @@
*/
#include "igt.h"
-#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <assert.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
#include <sys/time.h>
#define OBJECT_WIDTH 1280
diff --git a/benchmarks/intel_upload_blit_small.c b/benchmarks/intel_upload_blit_small.c
index 7e3346eb..91034a6b 100644
--- a/benchmarks/intel_upload_blit_small.c
+++ b/benchmarks/intel_upload_blit_small.c
@@ -44,11 +44,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <assert.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
#include <sys/time.h>
/* Happens to be 128k, the size of the VBOs used by i965's Mesa driver. */
diff --git a/benchmarks/kms_vblank.c b/benchmarks/kms_vblank.c
index f32cc9e3..d7050fbc 100644
--- a/benchmarks/kms_vblank.c
+++ b/benchmarks/kms_vblank.c
@@ -30,13 +30,8 @@
#include <stdio.h>
#include <string.h>
#include <unistd.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
#include <time.h>
-#include <sys/stat.h>
#include <sys/time.h>
-#include <sys/wait.h>
#include <drm.h>
#include <xf86drm.h>
diff --git a/benchmarks/prime_lookup.c b/benchmarks/prime_lookup.c
index 9c885367..3523a4f1 100644
--- a/benchmarks/prime_lookup.c
+++ b/benchmarks/prime_lookup.c
@@ -27,16 +27,10 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <sys/resource.h>
#include <sys/time.h>
#include <time.h>
-#include "drm.h"
#include "drmtest.h"
#include "i915/gem_create.h"
#include "igt_rand.h"
diff --git a/benchmarks/vgem_mmap.c b/benchmarks/vgem_mmap.c
index 7e4e459e..3deed448 100644
--- a/benchmarks/vgem_mmap.c
+++ b/benchmarks/vgem_mmap.c
@@ -27,11 +27,6 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <sys/time.h>
#include <time.h>
--
2.36.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [igt-dev] [PATCH i-g-t 04/14] overlay: Remove unused headers
2022-05-31 14:28 [igt-dev] [PATCH i-g-t 01/14] lib: Remove unused headers Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 02/14] assembler: " Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 03/14] benchmarks: " Ryszard Knop
@ 2022-05-31 14:28 ` Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 05/14] runner: " Ryszard Knop
` (9 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Ryszard Knop @ 2022-05-31 14:28 UTC (permalink / raw)
To: Development mailing list for IGT GPU Tools
Using CLion's automated code inspection, most unused includes were found
and removed. Some warnings remain as CLion is unable to track code usage
across certain attributes, but the vast majority of unneeded headers are
now gone.
Signed-off-by: Ryszard Knop <ryszard.knop@intel.com>
---
overlay/config.c | 2 --
overlay/gem-interrupts.c | 1 -
overlay/gpu-top.c | 5 -----
overlay/kms/kms-overlay.c | 2 --
overlay/overlay.c | 2 --
overlay/power.c | 3 ---
overlay/rc6.c | 1 -
overlay/x11/dri2.c | 1 -
overlay/x11/position.c | 3 ---
overlay/x11/x11-overlay.c | 2 --
overlay/x11/x11-window.c | 2 --
11 files changed, 24 deletions(-)
diff --git a/overlay/config.c b/overlay/config.c
index b6bd8dc3..30c6c1c7 100644
--- a/overlay/config.c
+++ b/overlay/config.c
@@ -22,7 +22,6 @@
*
*/
-#include <sys/types.h>
#include <sys/stat.h>
#include <sys/mman.h>
#include <stdlib.h>
@@ -31,7 +30,6 @@
#include <ctype.h>
#include <unistd.h>
#include <fcntl.h>
-#include <errno.h>
#include "overlay.h"
diff --git a/overlay/gem-interrupts.c b/overlay/gem-interrupts.c
index be73b693..d1de17db 100644
--- a/overlay/gem-interrupts.c
+++ b/overlay/gem-interrupts.c
@@ -22,7 +22,6 @@
*
*/
-#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
diff --git a/overlay/gpu-top.c b/overlay/gpu-top.c
index 32123abd..c073df3f 100644
--- a/overlay/gpu-top.c
+++ b/overlay/gpu-top.c
@@ -23,13 +23,8 @@
*/
#include <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <assert.h>
#include "igt_perf.h"
diff --git a/overlay/kms/kms-overlay.c b/overlay/kms/kms-overlay.c
index cfb3d5ae..4c936c55 100644
--- a/overlay/kms/kms-overlay.c
+++ b/overlay/kms/kms-overlay.c
@@ -22,7 +22,6 @@
*
*/
-#include <sys/types.h>
#include <sys/mman.h>
#include <cairo.h>
#include <stdio.h>
@@ -38,7 +37,6 @@
#include <xf86drmMode.h>
#include <i915_drm.h>
#include "../overlay.h"
-//#include "rgb2yuv.h"
#ifndef ALIGN
#define ALIGN(i,m) (((i) + (m) - 1) & ~((m) - 1))
diff --git a/overlay/overlay.c b/overlay/overlay.c
index fdc62091..dc36af1d 100644
--- a/overlay/overlay.c
+++ b/overlay/overlay.c
@@ -23,7 +23,6 @@
*/
#include <sys/types.h>
-#include <sys/mman.h>
#include <cairo.h>
#include <stdio.h>
#include <stdlib.h>
@@ -39,7 +38,6 @@
#include "overlay.h"
#include "chart.h"
-#include "config.h"
#include "cpu-top.h"
#include "debugfs.h"
#include "gem-interrupts.h"
diff --git a/overlay/power.c b/overlay/power.c
index 76fafea9..1027b28a 100644
--- a/overlay/power.c
+++ b/overlay/power.c
@@ -24,11 +24,9 @@
#include <stdint.h>
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <fcntl.h>
-#include <time.h>
#include <errno.h>
#include <ctype.h>
#include <locale.h>
@@ -37,7 +35,6 @@
#include "igt_perf.h"
#include "power.h"
-#include "debugfs.h"
static int
filename_to_buf(const char *filename, char *buf, unsigned int bufsize)
diff --git a/overlay/rc6.c b/overlay/rc6.c
index 69f95f28..33553428 100644
--- a/overlay/rc6.c
+++ b/overlay/rc6.c
@@ -24,7 +24,6 @@
#include <sys/stat.h>
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <fcntl.h>
diff --git a/overlay/x11/dri2.c b/overlay/x11/dri2.c
index 6c9e90d6..7459f31a 100644
--- a/overlay/x11/dri2.c
+++ b/overlay/x11/dri2.c
@@ -30,7 +30,6 @@
* Kristian Høgsberg (krh@redhat.com)
*/
-#include <stdio.h>
#include <X11/Xlibint.h>
#include <X11/extensions/Xext.h>
#include <X11/extensions/extutil.h>
diff --git a/overlay/x11/position.c b/overlay/x11/position.c
index 9e3db370..e18934d2 100644
--- a/overlay/x11/position.c
+++ b/overlay/x11/position.c
@@ -22,15 +22,12 @@
*
*/
-#include "config.h"
-
#include <X11/Xlib.h>
#ifdef HAVE_XRANDR
#include <X11/extensions/Xrandr.h>
#endif
#include <string.h>
#include <stdio.h>
-#include <stdlib.h>
#include "position.h"
#include "../overlay.h"
diff --git a/overlay/x11/x11-overlay.c b/overlay/x11/x11-overlay.c
index ac6b5f39..f14fc2d9 100644
--- a/overlay/x11/x11-overlay.c
+++ b/overlay/x11/x11-overlay.c
@@ -24,10 +24,8 @@
#include <X11/Xlib.h>
#include <X11/extensions/Xvlib.h>
-#include <sys/types.h>
#include <sys/mman.h>
#include <cairo.h>
-#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <string.h>
diff --git a/overlay/x11/x11-window.c b/overlay/x11/x11-window.c
index 6bdc48c2..3d2ed065 100644
--- a/overlay/x11/x11-window.c
+++ b/overlay/x11/x11-window.c
@@ -25,11 +25,9 @@
#include <X11/Xlib.h>
#include <cairo.h>
#include <cairo-xlib.h>
-#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <string.h>
-#include <unistd.h>
#include "../overlay.h"
#include "position.h"
--
2.36.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [igt-dev] [PATCH i-g-t 05/14] runner: Remove unused headers
2022-05-31 14:28 [igt-dev] [PATCH i-g-t 01/14] lib: Remove unused headers Ryszard Knop
` (2 preceding siblings ...)
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 04/14] overlay: " Ryszard Knop
@ 2022-05-31 14:28 ` Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 06/14] tests/amdgpu: " Ryszard Knop
` (8 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Ryszard Knop @ 2022-05-31 14:28 UTC (permalink / raw)
To: Development mailing list for IGT GPU Tools
Using CLion's automated code inspection, most unused includes were found
and removed. Some warnings remain as CLion is unable to track code usage
across certain attributes, but the vast majority of unneeded headers are
now gone.
Signed-off-by: Ryszard Knop <ryszard.knop@intel.com>
---
runner/job_list.c | 2 --
runner/resultgen.c | 1 -
runner/results.c | 2 --
runner/resume.c | 2 --
runner/runner.c | 1 -
runner/runner_json_tests.c | 1 -
runner/settings.c | 1 -
7 files changed, 10 deletions(-)
diff --git a/runner/job_list.c b/runner/job_list.c
index 520a98da..3d6ef002 100644
--- a/runner/job_list.c
+++ b/runner/job_list.c
@@ -1,12 +1,10 @@
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
-#include <linux/limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
-#include <sys/types.h>
#include <unistd.h>
#include "job_list.h"
diff --git a/runner/resultgen.c b/runner/resultgen.c
index 6ecf325b..1d92d303 100644
--- a/runner/resultgen.c
+++ b/runner/resultgen.c
@@ -5,7 +5,6 @@
#include <string.h>
#include <sys/mman.h>
#include <sys/stat.h>
-#include <sys/types.h>
#include <unistd.h>
#include <json.h>
diff --git a/runner/results.c b/runner/results.c
index 3eb7cb15..31510a05 100644
--- a/runner/results.c
+++ b/runner/results.c
@@ -1,8 +1,6 @@
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/types.h>
#include "resultgen.h"
diff --git a/runner/resume.c b/runner/resume.c
index eb8074e3..10cf253c 100644
--- a/runner/resume.c
+++ b/runner/resume.c
@@ -2,8 +2,6 @@
#include <fcntl.h>
#include <stdio.h>
#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
#include "settings.h"
#include "job_list.h"
diff --git a/runner/runner.c b/runner/runner.c
index 4855ad64..62c2671c 100644
--- a/runner/runner.c
+++ b/runner/runner.c
@@ -1,5 +1,4 @@
#include <stdio.h>
-#include <string.h>
#include "settings.h"
#include "job_list.h"
diff --git a/runner/runner_json_tests.c b/runner/runner_json_tests.c
index 7253c906..6b94bc1e 100644
--- a/runner/runner_json_tests.c
+++ b/runner/runner_json_tests.c
@@ -1,5 +1,4 @@
#include <sys/types.h>
-#include <sys/stat.h>
#include <fcntl.h>
#include <json.h>
diff --git a/runner/settings.c b/runner/settings.c
index bb63a9f4..313a0c95 100644
--- a/runner/settings.c
+++ b/runner/settings.c
@@ -10,7 +10,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <sys/types.h>
#include <sys/stat.h>
#include <sys/utsname.h>
#include <unistd.h>
--
2.36.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [igt-dev] [PATCH i-g-t 06/14] tests/amdgpu: Remove unused headers
2022-05-31 14:28 [igt-dev] [PATCH i-g-t 01/14] lib: Remove unused headers Ryszard Knop
` (3 preceding siblings ...)
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 05/14] runner: " Ryszard Knop
@ 2022-05-31 14:28 ` Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 07/14] tests/vc4*: " Ryszard Knop
` (7 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Ryszard Knop @ 2022-05-31 14:28 UTC (permalink / raw)
To: Development mailing list for IGT GPU Tools
Using CLion's automated code inspection, most unused includes were found
and removed. Some warnings remain as CLion is unable to track code usage
across certain attributes, but the vast majority of unneeded headers are
now gone.
Signed-off-by: Ryszard Knop <ryszard.knop@intel.com>
---
tests/amdgpu/amd_abm.c | 2 --
tests/amdgpu/amd_assr.c | 2 --
tests/amdgpu/amd_basic.c | 5 +----
tests/amdgpu/amd_dp_dsc.c | 1 -
tests/amdgpu/amd_ilr.c | 4 ----
tests/amdgpu/amd_info.c | 2 --
6 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/tests/amdgpu/amd_abm.c b/tests/amdgpu/amd_abm.c
index 9400ed80..815de85b 100644
--- a/tests/amdgpu/amd_abm.c
+++ b/tests/amdgpu/amd_abm.c
@@ -20,7 +20,6 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
-#include "igt.h"
#include "drmtest.h"
#include "igt_kms.h"
#include <limits.h>
@@ -30,7 +29,6 @@
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
-#include <time.h>
#define DEBUGFS_CURRENT_BACKLIGHT_PWM "amdgpu_current_backlight_pwm"
#define DEBUGFS_TARGET_BACKLIGHT_PWM "amdgpu_target_backlight_pwm"
diff --git a/tests/amdgpu/amd_assr.c b/tests/amdgpu/amd_assr.c
index 80cbbe8e..79510732 100644
--- a/tests/amdgpu/amd_assr.c
+++ b/tests/amdgpu/amd_assr.c
@@ -24,8 +24,6 @@
#include "igt_sysfs.h"
#include <dirent.h>
#include <fcntl.h>
-#include <limits.h>
-#include <sys/types.h>
#include <sys/stat.h>
IGT_TEST_DESCRIPTION("Check if ASSR is enabled on eDP links that support "
diff --git a/tests/amdgpu/amd_basic.c b/tests/amdgpu/amd_basic.c
index 6c9609b9..ab08fb8c 100644
--- a/tests/amdgpu/amd_basic.c
+++ b/tests/amdgpu/amd_basic.c
@@ -22,13 +22,10 @@
* Based on libdrm/tests/amdgpu/basic_tests.c
*/
-#include "config.h"
-
-#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
+#include <alloca.h>
#endif
#include "drmtest.h"
diff --git a/tests/amdgpu/amd_dp_dsc.c b/tests/amdgpu/amd_dp_dsc.c
index 8a18df3b..b818a3bc 100644
--- a/tests/amdgpu/amd_dp_dsc.c
+++ b/tests/amdgpu/amd_dp_dsc.c
@@ -22,7 +22,6 @@
#include "igt.h"
#include "igt_amd.h"
-#include "sw_sync.h"
#include <fcntl.h>
#include <signal.h>
diff --git a/tests/amdgpu/amd_ilr.c b/tests/amdgpu/amd_ilr.c
index 50ca93a1..27376ea1 100644
--- a/tests/amdgpu/amd_ilr.c
+++ b/tests/amdgpu/amd_ilr.c
@@ -22,11 +22,7 @@
#include "igt.h"
#include "igt_amd.h"
-#include "igt_sysfs.h"
#include <dirent.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <sys/types.h>
#include <sys/stat.h>
#define MULTIPLIER_TO_LR 270000
diff --git a/tests/amdgpu/amd_info.c b/tests/amdgpu/amd_info.c
index d6aea827..b53b4dc0 100644
--- a/tests/amdgpu/amd_info.c
+++ b/tests/amdgpu/amd_info.c
@@ -21,8 +21,6 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
-#include "config.h"
-
#include "igt.h"
#include <amdgpu.h>
--
2.36.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [igt-dev] [PATCH i-g-t 07/14] tests/vc4*: Remove unused headers
2022-05-31 14:28 [igt-dev] [PATCH i-g-t 01/14] lib: Remove unused headers Ryszard Knop
` (4 preceding siblings ...)
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 06/14] tests/amdgpu: " Ryszard Knop
@ 2022-05-31 14:28 ` Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 08/14] tests/v3d*: " Ryszard Knop
` (6 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Ryszard Knop @ 2022-05-31 14:28 UTC (permalink / raw)
To: Development mailing list for IGT GPU Tools
Using CLion's automated code inspection, most unused includes were found
and removed. Some warnings remain as CLion is unable to track code usage
across certain attributes, but the vast majority of unneeded headers are
now gone.
Signed-off-by: Ryszard Knop <ryszard.knop@intel.com>
---
tests/vc4_create_bo.c | 5 -----
tests/vc4_dmabuf_poll.c | 5 -----
tests/vc4_label_bo.c | 6 ------
tests/vc4_lookup_fail.c | 5 -----
tests/vc4_purgeable_bo.c | 5 -----
tests/vc4_tiling.c | 7 -------
tests/vc4_wait_bo.c | 4 ----
tests/vc4_wait_seqno.c | 6 ------
8 files changed, 43 deletions(-)
diff --git a/tests/vc4_create_bo.c b/tests/vc4_create_bo.c
index 99d180a8..dc5d565d 100644
--- a/tests/vc4_create_bo.c
+++ b/tests/vc4_create_bo.c
@@ -24,14 +24,9 @@
#include "igt.h"
#include "igt_vc4.h"
#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include "vc4_drm.h"
igt_main
diff --git a/tests/vc4_dmabuf_poll.c b/tests/vc4_dmabuf_poll.c
index 260e30c3..9027a352 100644
--- a/tests/vc4_dmabuf_poll.c
+++ b/tests/vc4_dmabuf_poll.c
@@ -24,14 +24,9 @@
#include "igt.h"
#include "igt_vc4.h"
#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <poll.h>
#include "vc4_drm.h"
diff --git a/tests/vc4_label_bo.c b/tests/vc4_label_bo.c
index 7510f87d..e77c0a35 100644
--- a/tests/vc4_label_bo.c
+++ b/tests/vc4_label_bo.c
@@ -24,15 +24,9 @@
#include "igt.h"
#include "igt_vc4.h"
#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <poll.h>
#include "vc4_drm.h"
static void
diff --git a/tests/vc4_lookup_fail.c b/tests/vc4_lookup_fail.c
index f0234ee5..0b200514 100644
--- a/tests/vc4_lookup_fail.c
+++ b/tests/vc4_lookup_fail.c
@@ -24,14 +24,9 @@
#include "igt.h"
#include <assert.h>
#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include "vc4_drm.h"
#include "vc4_packet.h"
diff --git a/tests/vc4_purgeable_bo.c b/tests/vc4_purgeable_bo.c
index d9f7547f..e0a01d42 100644
--- a/tests/vc4_purgeable_bo.c
+++ b/tests/vc4_purgeable_bo.c
@@ -26,13 +26,8 @@
#include <unistd.h>
#include <signal.h>
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include "vc4_drm.h"
struct igt_vc4_bo {
diff --git a/tests/vc4_tiling.c b/tests/vc4_tiling.c
index b96fe4ad..06e8e64e 100644
--- a/tests/vc4_tiling.c
+++ b/tests/vc4_tiling.c
@@ -24,15 +24,8 @@
#include "igt.h"
#include "igt_vc4.h"
#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <poll.h>
#include "vc4_drm.h"
igt_main
diff --git a/tests/vc4_wait_bo.c b/tests/vc4_wait_bo.c
index 65a085a3..eba5a2b5 100644
--- a/tests/vc4_wait_bo.c
+++ b/tests/vc4_wait_bo.c
@@ -24,13 +24,9 @@
#include "igt.h"
#include "igt_vc4.h"
#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
#include <sys/ioctl.h>
#include "vc4_drm.h"
diff --git a/tests/vc4_wait_seqno.c b/tests/vc4_wait_seqno.c
index bcc263cb..08b85f5b 100644
--- a/tests/vc4_wait_seqno.c
+++ b/tests/vc4_wait_seqno.c
@@ -23,14 +23,8 @@
#include "igt.h"
#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include "vc4_drm.h"
igt_main
--
2.36.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [igt-dev] [PATCH i-g-t 08/14] tests/v3d*: Remove unused headers
2022-05-31 14:28 [igt-dev] [PATCH i-g-t 01/14] lib: Remove unused headers Ryszard Knop
` (5 preceding siblings ...)
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 07/14] tests/vc4*: " Ryszard Knop
@ 2022-05-31 14:28 ` Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 09/14] tests/panfrost*: " Ryszard Knop
` (5 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Ryszard Knop @ 2022-05-31 14:28 UTC (permalink / raw)
To: Development mailing list for IGT GPU Tools
Using CLion's automated code inspection, most unused includes were found
and removed. Some warnings remain as CLion is unable to track code usage
across certain attributes, but the vast majority of unneeded headers are
now gone.
Signed-off-by: Ryszard Knop <ryszard.knop@intel.com>
---
tests/v3d_get_bo_offset.c | 7 -------
tests/v3d_get_param.c | 7 -------
tests/v3d_mmap.c | 9 ---------
3 files changed, 23 deletions(-)
diff --git a/tests/v3d_get_bo_offset.c b/tests/v3d_get_bo_offset.c
index 0923dc85..3b32a203 100644
--- a/tests/v3d_get_bo_offset.c
+++ b/tests/v3d_get_bo_offset.c
@@ -24,17 +24,10 @@
#include "igt.h"
#include "igt_v3d.h"
#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <poll.h>
#include "v3d_drm.h"
-#include "igt_v3d.h"
igt_main
{
diff --git a/tests/v3d_get_param.c b/tests/v3d_get_param.c
index 76563406..5759f41a 100644
--- a/tests/v3d_get_param.c
+++ b/tests/v3d_get_param.c
@@ -24,17 +24,10 @@
#include "igt.h"
#include "igt_v3d.h"
#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <poll.h>
#include "v3d_drm.h"
-#include "igt_v3d.h"
igt_main
{
diff --git a/tests/v3d_mmap.c b/tests/v3d_mmap.c
index a6fe7e5a..d8d9a03e 100644
--- a/tests/v3d_mmap.c
+++ b/tests/v3d_mmap.c
@@ -22,19 +22,10 @@
*/
#include "igt.h"
-#include "igt_v3d.h"
#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <poll.h>
#include "v3d_drm.h"
-#include "igt_v3d.h"
igt_main
{
--
2.36.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [igt-dev] [PATCH i-g-t 09/14] tests/panfrost*: Remove unused headers
2022-05-31 14:28 [igt-dev] [PATCH i-g-t 01/14] lib: Remove unused headers Ryszard Knop
` (6 preceding siblings ...)
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 08/14] tests/v3d*: " Ryszard Knop
@ 2022-05-31 14:28 ` Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 10/14] tests/kms*: " Ryszard Knop
` (4 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Ryszard Knop @ 2022-05-31 14:28 UTC (permalink / raw)
To: Development mailing list for IGT GPU Tools
Using CLion's automated code inspection, most unused includes were found
and removed. Some warnings remain as CLion is unable to track code usage
across certain attributes, but the vast majority of unneeded headers are
now gone.
Signed-off-by: Ryszard Knop <ryszard.knop@intel.com>
---
tests/panfrost_gem_new.c | 5 -----
tests/panfrost_get_param.c | 6 ------
tests/panfrost_prime.c | 5 -----
tests/panfrost_submit.c | 4 ----
4 files changed, 20 deletions(-)
diff --git a/tests/panfrost_gem_new.c b/tests/panfrost_gem_new.c
index 940525ff..7e753f82 100644
--- a/tests/panfrost_gem_new.c
+++ b/tests/panfrost_gem_new.c
@@ -25,14 +25,9 @@
#include "igt.h"
#include "igt_panfrost.h"
#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include "panfrost_drm.h"
igt_main
diff --git a/tests/panfrost_get_param.c b/tests/panfrost_get_param.c
index 11c2632b..943d62eb 100644
--- a/tests/panfrost_get_param.c
+++ b/tests/panfrost_get_param.c
@@ -25,15 +25,9 @@
#include "igt.h"
#include "igt_panfrost.h"
#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <poll.h>
#include "panfrost_drm.h"
igt_main
diff --git a/tests/panfrost_prime.c b/tests/panfrost_prime.c
index 40ba036b..02eb6507 100644
--- a/tests/panfrost_prime.c
+++ b/tests/panfrost_prime.c
@@ -25,14 +25,9 @@
#include "igt.h"
#include "igt_panfrost.h"
#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include "panfrost_drm.h"
static bool igt_has_dumb(int fd)
diff --git a/tests/panfrost_submit.c b/tests/panfrost_submit.c
index 4747d295..fb7c0e58 100644
--- a/tests/panfrost_submit.c
+++ b/tests/panfrost_submit.c
@@ -26,14 +26,10 @@
#include "igt_panfrost.h"
#include "igt_syncobj.h"
#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include "panfrost-job.h"
#include "panfrost_drm.h"
--
2.36.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [igt-dev] [PATCH i-g-t 10/14] tests/kms*: Remove unused headers
2022-05-31 14:28 [igt-dev] [PATCH i-g-t 01/14] lib: Remove unused headers Ryszard Knop
` (7 preceding siblings ...)
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 09/14] tests/panfrost*: " Ryszard Knop
@ 2022-05-31 14:28 ` Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 11/14] tests/*: " Ryszard Knop
` (3 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Ryszard Knop @ 2022-05-31 14:28 UTC (permalink / raw)
To: Development mailing list for IGT GPU Tools
Using CLion's automated code inspection, most unused includes were found
and removed. Some warnings remain as CLion is unable to track code usage
across certain attributes, but the vast majority of unneeded headers are
now gone.
Signed-off-by: Ryszard Knop <ryszard.knop@intel.com>
---
tests/kms_addfb_basic.c | 4 ----
tests/kms_atomic.c | 2 --
tests/kms_atomic_transition.c | 1 -
tests/kms_bw.c | 1 -
tests/kms_chamelium.c | 2 --
tests/kms_content_protection.c | 1 -
tests/kms_cursor_edge_walk.c | 1 -
tests/kms_dither.c | 2 --
tests/kms_dp_aux_dev.c | 4 ----
tests/kms_flip_event_leak.c | 3 ---
tests/kms_getfb.c | 6 ------
tests/kms_hdmi_inject.c | 2 --
tests/kms_hdr.c | 2 --
tests/kms_lease.c | 6 ------
tests/kms_panel_fitting.c | 1 -
tests/kms_pipe_crc_basic.c | 1 -
tests/kms_plane.c | 1 -
tests/kms_plane_lowres.c | 2 --
tests/kms_plane_multiple.c | 1 -
tests/kms_plane_scaling.c | 1 -
tests/kms_prime.c | 2 --
tests/kms_prop_blob.c | 2 --
tests/kms_properties.c | 2 --
tests/kms_rmfb.c | 2 --
tests/kms_sequence.c | 3 ---
tests/kms_setmode.c | 2 --
tests/kms_vblank.c | 3 ---
tests/kms_writeback.c | 1 -
28 files changed, 61 deletions(-)
diff --git a/tests/kms_addfb_basic.c b/tests/kms_addfb_basic.c
index 6b2323a9..3e72c575 100644
--- a/tests/kms_addfb_basic.c
+++ b/tests/kms_addfb_basic.c
@@ -27,14 +27,10 @@
#include "igt.h"
#include <unistd.h>
-#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
-#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include "drm.h"
#include "drm_fourcc.h"
diff --git a/tests/kms_atomic.c b/tests/kms_atomic.c
index 253829f2..07b6b2ee 100644
--- a/tests/kms_atomic.c
+++ b/tests/kms_atomic.c
@@ -32,8 +32,6 @@
*/
#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <stdint.h>
#include <string.h>
#include <errno.h>
diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c
index 10b21c92..0f31eece 100644
--- a/tests/kms_atomic_transition.c
+++ b/tests/kms_atomic_transition.c
@@ -30,7 +30,6 @@
#include <stdbool.h>
#include <stdio.h>
#include <string.h>
-#include <time.h>
#include <poll.h>
#ifndef DRM_CAP_CURSOR_WIDTH
diff --git a/tests/kms_bw.c b/tests/kms_bw.c
index a4553cde..13e4463c 100644
--- a/tests/kms_bw.c
+++ b/tests/kms_bw.c
@@ -22,7 +22,6 @@
#include "drm_mode.h"
#include "igt.h"
-#include "drm.h"
#include <stdio.h>
#include <xf86drmMode.h>
diff --git a/tests/kms_chamelium.c b/tests/kms_chamelium.c
index d97b439a..aec82b1c 100644
--- a/tests/kms_chamelium.c
+++ b/tests/kms_chamelium.c
@@ -24,9 +24,7 @@
* Lyude Paul <lyude@redhat.com>
*/
-#include "config.h"
#include "igt.h"
-#include "igt_vc4.h"
#include "igt_edid.h"
#include "igt_eld.h"
#include "igt_infoframe.h"
diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c
index 3041f1cd..5964a6d7 100644
--- a/tests/kms_content_protection.c
+++ b/tests/kms_content_protection.c
@@ -24,7 +24,6 @@
#include <poll.h>
#include <fcntl.h>
-#include <sys/epoll.h>
#include <sys/stat.h>
#include <libudev.h>
#include "igt.h"
diff --git a/tests/kms_cursor_edge_walk.c b/tests/kms_cursor_edge_walk.c
index b775714f..2baf280e 100644
--- a/tests/kms_cursor_edge_walk.c
+++ b/tests/kms_cursor_edge_walk.c
@@ -24,7 +24,6 @@
#include "igt.h"
#include <errno.h>
-#include <limits.h>
#include <stdbool.h>
#include <stdio.h>
#include <string.h>
diff --git a/tests/kms_dither.c b/tests/kms_dither.c
index 21c1618a..83799304 100644
--- a/tests/kms_dither.c
+++ b/tests/kms_dither.c
@@ -26,8 +26,6 @@
*/
#include "igt.h"
-#include <fcntl.h>
-#include <termios.h>
#include <unistd.h>
IGT_TEST_DESCRIPTION("Test Dithering block status");
diff --git a/tests/kms_dp_aux_dev.c b/tests/kms_dp_aux_dev.c
index d3249fa3..e1b26b5b 100644
--- a/tests/kms_dp_aux_dev.c
+++ b/tests/kms_dp_aux_dev.c
@@ -22,10 +22,6 @@
*
*/
-#include "config.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
#include <fcntl.h>
#include <dirent.h>
diff --git a/tests/kms_flip_event_leak.c b/tests/kms_flip_event_leak.c
index ac201293..90c6c547 100644
--- a/tests/kms_flip_event_leak.c
+++ b/tests/kms_flip_event_leak.c
@@ -23,9 +23,6 @@
*/
#include "igt.h"
-#include <errno.h>
-#include <stdbool.h>
-#include <stdio.h>
#include <string.h>
#include "igt_device.h"
diff --git a/tests/kms_getfb.c b/tests/kms_getfb.c
index b3a8d265..534aff78 100644
--- a/tests/kms_getfb.c
+++ b/tests/kms_getfb.c
@@ -30,18 +30,12 @@
#include "igt.h"
#include <unistd.h>
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include "drm.h"
#include "drm_fourcc.h"
-#include "i915/gem_create.h"
-#include "igt_device.h"
IGT_TEST_DESCRIPTION("Tests GETFB and GETFB2 ioctls.");
diff --git a/tests/kms_hdmi_inject.c b/tests/kms_hdmi_inject.c
index abae0ab4..051c9b4e 100644
--- a/tests/kms_hdmi_inject.c
+++ b/tests/kms_hdmi_inject.c
@@ -22,8 +22,6 @@
*
*/
-#include "config.h"
-
#include <dirent.h>
#include "igt.h"
diff --git a/tests/kms_hdr.c b/tests/kms_hdr.c
index fb2e0790..0c0a803b 100644
--- a/tests/kms_hdr.c
+++ b/tests/kms_hdr.c
@@ -21,8 +21,6 @@
*/
#include "igt.h"
-#include <fcntl.h>
-#include <termios.h>
#include <unistd.h>
#include "igt_edid.h"
diff --git a/tests/kms_lease.c b/tests/kms_lease.c
index 0bf102a6..b5b6ea2e 100644
--- a/tests/kms_lease.c
+++ b/tests/kms_lease.c
@@ -34,14 +34,8 @@
#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
-#include <time.h>
-#include <sys/poll.h>
-#include <sys/stat.h>
-#include <sys/time.h>
#include <sys/wait.h>
-#include <libudev.h>
-
#include <drm.h>
#include "igt_device.h"
diff --git a/tests/kms_panel_fitting.c b/tests/kms_panel_fitting.c
index 9f607376..7756cfca 100644
--- a/tests/kms_panel_fitting.c
+++ b/tests/kms_panel_fitting.c
@@ -23,7 +23,6 @@
*/
#include "igt.h"
-#include <math.h>
#include <sys/stat.h>
IGT_TEST_DESCRIPTION("Test display panel fitting");
diff --git a/tests/kms_pipe_crc_basic.c b/tests/kms_pipe_crc_basic.c
index 0861c46d..edd8a0bc 100644
--- a/tests/kms_pipe_crc_basic.c
+++ b/tests/kms_pipe_crc_basic.c
@@ -25,7 +25,6 @@
#include "igt.h"
#include "igt_sysfs.h"
#include <errno.h>
-#include <stdbool.h>
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
diff --git a/tests/kms_plane.c b/tests/kms_plane.c
index b1be44c3..21e73c3b 100644
--- a/tests/kms_plane.c
+++ b/tests/kms_plane.c
@@ -26,7 +26,6 @@
#include "igt.h"
#include "igt_vec.h"
-#include <errno.h>
#include <stdbool.h>
#include <stdio.h>
#include <string.h>
diff --git a/tests/kms_plane_lowres.c b/tests/kms_plane_lowres.c
index 3f3f77c8..f7e4a890 100644
--- a/tests/kms_plane_lowres.c
+++ b/tests/kms_plane_lowres.c
@@ -24,11 +24,9 @@
#include "igt.h"
#include "drmtest.h"
-#include <errno.h>
#include <stdbool.h>
#include <stdio.h>
#include <string.h>
-#include <time.h>
IGT_TEST_DESCRIPTION("Test atomic mode setting with a plane by switching between high and low resolutions");
diff --git a/tests/kms_plane_multiple.c b/tests/kms_plane_multiple.c
index 1679f7ce..edbb5e25 100644
--- a/tests/kms_plane_multiple.c
+++ b/tests/kms_plane_multiple.c
@@ -24,7 +24,6 @@
#include "igt.h"
#include "drmtest.h"
-#include <errno.h>
#include <stdbool.h>
#include <stdio.h>
#include <string.h>
diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c
index fc8250b5..ce448d5a 100644
--- a/tests/kms_plane_scaling.c
+++ b/tests/kms_plane_scaling.c
@@ -24,7 +24,6 @@
#include "igt.h"
#include "igt_vec.h"
-#include <math.h>
IGT_TEST_DESCRIPTION("Test display plane scaling");
diff --git a/tests/kms_prime.c b/tests/kms_prime.c
index 1ad4b3a6..c232970e 100644
--- a/tests/kms_prime.c
+++ b/tests/kms_prime.c
@@ -24,8 +24,6 @@
#include "igt.h"
#include "igt_device.h"
-#include <sys/ioctl.h>
-#include <sys/poll.h>
#include <time.h>
struct dumb_bo {
diff --git a/tests/kms_prop_blob.c b/tests/kms_prop_blob.c
index 96aa6d8d..b9571bb9 100644
--- a/tests/kms_prop_blob.c
+++ b/tests/kms_prop_blob.c
@@ -27,8 +27,6 @@
#include "igt.h"
#include <errno.h>
-#include <stdbool.h>
-#include <stdio.h>
#include <string.h>
IGT_TEST_DESCRIPTION("Tests behaviour of mass-data 'blob' properties.");
diff --git a/tests/kms_properties.c b/tests/kms_properties.c
index dd5a93aa..2fae751e 100644
--- a/tests/kms_properties.c
+++ b/tests/kms_properties.c
@@ -25,9 +25,7 @@
#include "drmtest.h"
#include <errno.h>
#include <stdbool.h>
-#include <stdio.h>
#include <string.h>
-#include <time.h>
struct additional_test {
const char *name;
diff --git a/tests/kms_rmfb.c b/tests/kms_rmfb.c
index fcd5cdad..3f5173cb 100644
--- a/tests/kms_rmfb.c
+++ b/tests/kms_rmfb.c
@@ -23,11 +23,9 @@
#include "igt.h"
#include "drmtest.h"
-#include <errno.h>
#include <stdbool.h>
#include <stdio.h>
#include <string.h>
-#include <time.h>
#ifndef DRM_CAP_CURSOR_WIDTH
#define DRM_CAP_CURSOR_WIDTH 0x8
diff --git a/tests/kms_sequence.c b/tests/kms_sequence.c
index 1655d7d1..3f7109f0 100644
--- a/tests/kms_sequence.c
+++ b/tests/kms_sequence.c
@@ -31,13 +31,10 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
#include <time.h>
#include <sys/poll.h>
-#include <sys/stat.h>
-#include <sys/time.h>
#include <sys/wait.h>
#include <drm.h>
diff --git a/tests/kms_setmode.c b/tests/kms_setmode.c
index 8c755091..5e88e939 100644
--- a/tests/kms_setmode.c
+++ b/tests/kms_setmode.c
@@ -20,7 +20,6 @@
* Authors:
* Imre Deak <imre.deak@intel.com>
*/
-#include "config.h"
#include "igt.h"
#include <cairo.h>
@@ -28,7 +27,6 @@
#include <stdint.h>
#include <unistd.h>
#include <string.h>
-#include <sys/time.h>
#include <math.h>
#define MAX_CONNECTORS 10
diff --git a/tests/kms_vblank.c b/tests/kms_vblank.c
index e65e8522..9f40a67e 100644
--- a/tests/kms_vblank.c
+++ b/tests/kms_vblank.c
@@ -30,13 +30,10 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
#include <time.h>
#include <sys/poll.h>
-#include <sys/stat.h>
-#include <sys/time.h>
#include <sys/wait.h>
#include <drm.h>
diff --git a/tests/kms_writeback.c b/tests/kms_writeback.c
index b6c815db..60828a74 100644
--- a/tests/kms_writeback.c
+++ b/tests/kms_writeback.c
@@ -24,7 +24,6 @@
#include <errno.h>
#include <stdbool.h>
-#include <stdio.h>
#include <string.h>
#include "igt.h"
--
2.36.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [igt-dev] [PATCH i-g-t 11/14] tests/*: Remove unused headers
2022-05-31 14:28 [igt-dev] [PATCH i-g-t 01/14] lib: Remove unused headers Ryszard Knop
` (8 preceding siblings ...)
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 10/14] tests/kms*: " Ryszard Knop
@ 2022-05-31 14:28 ` Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 12/14] tools: " Ryszard Knop
` (2 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Ryszard Knop @ 2022-05-31 14:28 UTC (permalink / raw)
To: Development mailing list for IGT GPU Tools
Using CLion's automated code inspection, most unused includes were found
and removed. Some warnings remain as CLion is unable to track code usage
across certain attributes, but the vast majority of unneeded headers are
now gone.
Signed-off-by: Ryszard Knop <ryszard.knop@intel.com>
---
tests/core_auth.c | 11 +----------
tests/core_getclient.c | 1 -
tests/core_getstats.c | 1 -
tests/core_getversion.c | 1 -
tests/core_hotunplug.c | 3 ---
tests/core_setmaster_vs_auth.c | 2 --
tests/debugfs_test.c | 2 --
tests/drm_import_export.c | 7 -------
tests/drm_read.c | 7 -------
tests/dumb_buffer.c | 4 ----
tests/fbdev.c | 6 ------
tests/msm/msm_mapping.c | 1 -
tests/prime_mmap.c | 5 -----
tests/prime_nv_pcopy.c | 2 --
tests/prime_nv_test.c | 1 -
tests/prime_self_import.c | 2 --
tests/syncobj_timeline.c | 1 -
tests/syncobj_wait.c | 1 -
tests/testdisplay.c | 6 ------
tests/testdisplay_hotplug.c | 2 --
tests/tools_test.c | 4 ----
tests/vgem_slow.c | 2 --
22 files changed, 1 insertion(+), 71 deletions(-)
diff --git a/tests/core_auth.c b/tests/core_auth.c
index c9ad3fb9..1dd5f2f8 100644
--- a/tests/core_auth.c
+++ b/tests/core_auth.c
@@ -28,24 +28,15 @@
#include "igt.h"
#include <unistd.h>
#include <stdlib.h>
-#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <signal.h>
#include <fcntl.h>
-#include <inttypes.h>
#include <errno.h>
-#include <sched.h>
-#include <sys/mount.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/poll.h>
#include <sys/resource.h>
#include "drm.h"
#ifndef __linux__
-# include <pthread.h>
+#include <pthread.h>
#endif
IGT_TEST_DESCRIPTION("Call drmGetMagic() and drmAuthMagic() and see if it behaves.");
diff --git a/tests/core_getclient.c b/tests/core_getclient.c
index 40a1c194..7c48851a 100644
--- a/tests/core_getclient.c
+++ b/tests/core_getclient.c
@@ -26,7 +26,6 @@
*/
#include "igt.h"
-#include <limits.h>
#include <sys/ioctl.h>
#include <stdlib.h>
#include <errno.h>
diff --git a/tests/core_getstats.c b/tests/core_getstats.c
index fde27cdc..76195a31 100644
--- a/tests/core_getstats.c
+++ b/tests/core_getstats.c
@@ -26,7 +26,6 @@
*/
#include "igt.h"
-#include <limits.h>
#include <sys/ioctl.h>
#include <sys/types.h>
diff --git a/tests/core_getversion.c b/tests/core_getversion.c
index f6953b31..118e5835 100644
--- a/tests/core_getversion.c
+++ b/tests/core_getversion.c
@@ -27,7 +27,6 @@
#include "igt.h"
#include <string.h>
-#include <sys/ioctl.h>
IGT_TEST_DESCRIPTION("Tests the DRM_IOCTL_GET_VERSION ioctl and libdrm's "
"drmGetVersion() interface to it.");
diff --git a/tests/core_hotunplug.c b/tests/core_hotunplug.c
index a0d29b79..bf8bc3f2 100644
--- a/tests/core_hotunplug.c
+++ b/tests/core_hotunplug.c
@@ -26,10 +26,7 @@
#include <stdlib.h>
#include <string.h>
#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
#include <unistd.h>
-#include <signal.h>
#include "i915/gem.h"
#include "i915/gem_create.h"
diff --git a/tests/core_setmaster_vs_auth.c b/tests/core_setmaster_vs_auth.c
index 0b4b8613..03446c33 100644
--- a/tests/core_setmaster_vs_auth.c
+++ b/tests/core_setmaster_vs_auth.c
@@ -35,8 +35,6 @@
#include "igt.h"
#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
#include "igt_device.h"
diff --git a/tests/debugfs_test.c b/tests/debugfs_test.c
index 0b4b6e23..e73402ab 100644
--- a/tests/debugfs_test.c
+++ b/tests/debugfs_test.c
@@ -20,13 +20,11 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
-#include "config.h"
#include "i915/gem.h"
#include "igt.h"
#include "igt_sysfs.h"
#include <fcntl.h>
-#include <sys/types.h>
#include <dirent.h>
IGT_TEST_DESCRIPTION("Read entries from debugfs and sysfs paths.");
diff --git a/tests/drm_import_export.c b/tests/drm_import_export.c
index 06245e8b..c3c0bc20 100644
--- a/tests/drm_import_export.c
+++ b/tests/drm_import_export.c
@@ -25,20 +25,13 @@
*/
#include "igt.h"
-#include <stdio.h>
#include <sys/types.h>
-#include <sys/stat.h>
#include <fcntl.h>
-#include <stdlib.h>
#include <string.h>
-#include <drm.h>
-#include <i915_drm.h>
-#include <xf86drm.h>
#include <intel_bufmgr.h>
#include <errno.h>
#include <pthread.h>
#include <unistd.h>
-#include <sys/syscall.h>
#include "i915/gem.h"
diff --git a/tests/drm_read.c b/tests/drm_read.c
index 3186e609..e3acdd66 100644
--- a/tests/drm_read.c
+++ b/tests/drm_read.c
@@ -31,17 +31,10 @@
#include "igt.h"
#include <unistd.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdio.h>
#include <string.h>
#include <signal.h>
#include <fcntl.h>
-#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
#include <sys/poll.h>
#include <pthread.h>
#include "drm.h"
diff --git a/tests/dumb_buffer.c b/tests/dumb_buffer.c
index cb8d2f51..2e0311c1 100644
--- a/tests/dumb_buffer.c
+++ b/tests/dumb_buffer.c
@@ -32,16 +32,12 @@
*/
#include <errno.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <pthread.h>
#include <signal.h>
#include <stdatomic.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
#include <sys/time.h>
#include <drm.h>
diff --git a/tests/fbdev.c b/tests/fbdev.c
index 794882a6..64c86c08 100644
--- a/tests/fbdev.c
+++ b/tests/fbdev.c
@@ -21,8 +21,6 @@
* IN THE SOFTWARE.
*/
-#include "config.h"
-
#include "igt.h"
#include <errno.h>
@@ -31,14 +29,10 @@
#include <string.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/types.h>
#include <unistd.h>
#include <linux/fb.h>
-#include "igt.h"
-
#define PANSTEP(panstep_) \
((panstep_) ? (panstep_) : 1)
diff --git a/tests/msm/msm_mapping.c b/tests/msm/msm_mapping.c
index e1474f9f..21775aa8 100644
--- a/tests/msm/msm_mapping.c
+++ b/tests/msm/msm_mapping.c
@@ -26,7 +26,6 @@
#include <glob.h>
#include <string.h>
#include <sys/poll.h>
-#include <sys/stat.h>
#include "igt.h"
#include "igt_msm.h"
diff --git a/tests/prime_mmap.c b/tests/prime_mmap.c
index d53185ff..0c075214 100644
--- a/tests/prime_mmap.c
+++ b/tests/prime_mmap.c
@@ -34,11 +34,7 @@
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
-#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <pthread.h>
#include "drm.h"
#include "drmtest.h"
@@ -47,7 +43,6 @@
#include "i915_drm.h"
#include "i915/gem_create.h"
#include "i915/gem_mman.h"
-#include "igt_debugfs.h"
#include "ioctl_wrappers.h"
#include "i915/intel_memory_region.h"
diff --git a/tests/prime_nv_pcopy.c b/tests/prime_nv_pcopy.c
index e465e5fc..e98e48ee 100644
--- a/tests/prime_nv_pcopy.c
+++ b/tests/prime_nv_pcopy.c
@@ -22,8 +22,6 @@
#include <fcntl.h>
#include <string.h>
#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <errno.h>
#include "intel_bufmgr.h"
#include "nouveau.h"
diff --git a/tests/prime_nv_test.c b/tests/prime_nv_test.c
index 81d142f4..eb647668 100644
--- a/tests/prime_nv_test.c
+++ b/tests/prime_nv_test.c
@@ -21,7 +21,6 @@
#include <fcntl.h>
#include <string.h>
#include <sys/stat.h>
-#include <sys/ioctl.h>
#include "intel_bufmgr.h"
#include "nouveau.h"
diff --git a/tests/prime_self_import.c b/tests/prime_self_import.c
index bf548619..1494b86a 100644
--- a/tests/prime_self_import.c
+++ b/tests/prime_self_import.c
@@ -34,12 +34,10 @@
#include "igt.h"
#include <unistd.h>
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
#include <sys/ioctl.h>
#include <pthread.h>
diff --git a/tests/syncobj_timeline.c b/tests/syncobj_timeline.c
index 20375cdd..b4858673 100644
--- a/tests/syncobj_timeline.c
+++ b/tests/syncobj_timeline.c
@@ -26,7 +26,6 @@
#include "igt_syncobj.h"
#include <unistd.h>
#include <time.h>
-#include <sys/ioctl.h>
#include <pthread.h>
#include <signal.h>
#include "drm.h"
diff --git a/tests/syncobj_wait.c b/tests/syncobj_wait.c
index 669d0adf..19995544 100644
--- a/tests/syncobj_wait.c
+++ b/tests/syncobj_wait.c
@@ -26,7 +26,6 @@
#include "igt_syncobj.h"
#include <unistd.h>
#include <time.h>
-#include <sys/ioctl.h>
#include <pthread.h>
#include <signal.h>
#include "drm.h"
diff --git a/tests/testdisplay.c b/tests/testdisplay.c
index e9fbd260..7d79439e 100644
--- a/tests/testdisplay.c
+++ b/tests/testdisplay.c
@@ -45,23 +45,17 @@
* - DP commands (e.g. poweroff)
* - verify outputs against VBT/physical connectors
*/
-#include "config.h"
#include "igt.h"
#include <cairo.h>
#include <errno.h>
#include <getopt.h>
#include <libgen.h>
-#include <math.h>
#include <stdint.h>
#include <stdbool.h>
#include <strings.h>
#include <unistd.h>
#include <termios.h>
-#include <sys/poll.h>
-#include <sys/time.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
#include <sys/stat.h>
#include "testdisplay.h"
diff --git a/tests/testdisplay_hotplug.c b/tests/testdisplay_hotplug.c
index cd784895..f77554ca 100644
--- a/tests/testdisplay_hotplug.c
+++ b/tests/testdisplay_hotplug.c
@@ -22,14 +22,12 @@
*/
#include "igt.h"
-#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <sys/stat.h>
#include "testdisplay.h"
-#include "config.h"
#include <libudev.h>
diff --git a/tests/tools_test.c b/tests/tools_test.c
index 237f0433..476b2434 100644
--- a/tests/tools_test.c
+++ b/tests/tools_test.c
@@ -20,12 +20,8 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
-#include "config.h"
#include "igt.h"
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
#include <libgen.h>
#include <unistd.h>
#include <linux/limits.h>
diff --git a/tests/vgem_slow.c b/tests/vgem_slow.c
index 58b09e42..91fe6f20 100644
--- a/tests/vgem_slow.c
+++ b/tests/vgem_slow.c
@@ -28,8 +28,6 @@
#include <sys/mman.h>
#include <sys/poll.h>
-#include <sys/stat.h>
-#include <dirent.h>
IGT_TEST_DESCRIPTION("Extended sanity check of Virtual GEM module (vGEM).");
--
2.36.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [igt-dev] [PATCH i-g-t 12/14] tools: Remove unused headers
2022-05-31 14:28 [igt-dev] [PATCH i-g-t 01/14] lib: Remove unused headers Ryszard Knop
` (9 preceding siblings ...)
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 11/14] tests/*: " Ryszard Knop
@ 2022-05-31 14:28 ` Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 13/14] tests/i915/gem*: " Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 14/14] tests/i915/*: " Ryszard Knop
12 siblings, 0 replies; 14+ messages in thread
From: Ryszard Knop @ 2022-05-31 14:28 UTC (permalink / raw)
To: Development mailing list for IGT GPU Tools
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 20114 bytes --]
Using CLion's automated code inspection, most unused includes were found
and removed. Some warnings remain as CLion is unable to track code usage
across certain attributes, but the vast majority of unneeded headers are
now gone.
Signed-off-by: Ryszard Knop <ryszard.knop@intel.com>
---
tools/cnl_compute_wrpll.c | 1 -
tools/hsw_compute_wrpll.c | 3 ---
tools/i915-perf/i915_perf_configs.c | 1 -
tools/i915-perf/i915_perf_reader.c | 5 -----
tools/i915-perf/i915_perf_recorder.c | 4 ----
tools/igt_compliance_utils.c | 3 ---
tools/igt_dp_compliance_hotplug.c | 1 -
tools/igt_stats.c | 3 ---
tools/intel_audio_dump.c | 3 ---
tools/intel_backlight.c | 1 -
tools/intel_bios_dumper.c | 1 -
tools/intel_display_poller.c | 3 ---
tools/intel_dp_compliance.c | 11 -----------
tools/intel_error_decode.c | 3 ---
tools/intel_firmware_decode.c | 3 ---
tools/intel_forcewaked.c | 3 ---
tools/intel_framebuffer_dump.c | 3 ---
tools/intel_gem_info.c | 2 --
tools/intel_gpu_top.c | 1 -
tools/intel_gtt.c | 3 ---
tools/intel_guc_logger.c | 4 ----
tools/intel_gvtg_test.c | 15 ---------------
tools/intel_l3_parity.c | 3 ---
tools/intel_l3_udev_listener.c | 3 ---
tools/intel_lid.c | 5 -----
tools/intel_opregion_decode.c | 2 --
tools/intel_panel_fitter.c | 2 --
tools/intel_perf_counters.c | 3 ---
tools/intel_pm_rpm.c | 3 ---
tools/intel_reg.c | 1 -
tools/intel_reg_checker.c | 3 ---
tools/intel_residency.c | 1 -
tools/intel_stepping.c | 2 --
tools/intel_vbt_decode.c | 3 +--
tools/intel_watermark.c | 1 -
tools/lsgpu.c | 3 ---
tools/msm_dp_compliance.c | 11 -----------
tools/null_state_gen/intel_batchbuffer.c | 1 -
tools/null_state_gen/intel_null_state_gen.c | 1 -
tools/null_state_gen/intel_renderstate_gen8.c | 1 -
tools/skl_compute_wrpll.c | 2 --
41 files changed, 1 insertion(+), 127 deletions(-)
diff --git a/tools/cnl_compute_wrpll.c b/tools/cnl_compute_wrpll.c
index 9caf69f1..e4fd09e6 100644
--- a/tools/cnl_compute_wrpll.c
+++ b/tools/cnl_compute_wrpll.c
@@ -22,7 +22,6 @@
*/
#include <assert.h>
-#include <inttypes.h>
#include <limits.h>
#include <stdio.h>
#include <stdbool.h>
diff --git a/tools/hsw_compute_wrpll.c b/tools/hsw_compute_wrpll.c
index b1eeb7c7..5a498608 100644
--- a/tools/hsw_compute_wrpll.c
+++ b/tools/hsw_compute_wrpll.c
@@ -23,11 +23,8 @@
#include <inttypes.h>
#include <stdio.h>
-#include <stdbool.h>
#include <stdint.h>
-#include <stdlib.h>
-#include "intel_io.h"
#include "drmtest.h"
#define LC_FREQ 2700
diff --git a/tools/i915-perf/i915_perf_configs.c b/tools/i915-perf/i915_perf_configs.c
index bce3bd0f..5ba06bdc 100644
--- a/tools/i915-perf/i915_perf_configs.c
+++ b/tools/i915-perf/i915_perf_configs.c
@@ -33,7 +33,6 @@
#include <string.h>
#include <sys/ioctl.h>
#include <sys/sysmacros.h>
-#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
diff --git a/tools/i915-perf/i915_perf_reader.c b/tools/i915-perf/i915_perf_reader.c
index e51f5a5d..83242c4a 100644
--- a/tools/i915-perf/i915_perf_reader.c
+++ b/tools/i915-perf/i915_perf_reader.c
@@ -20,23 +20,18 @@
* SOFTWARE.
*/
-#include <assert.h>
#include <errno.h>
#include <fcntl.h>
#include <getopt.h>
#include <inttypes.h>
-#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
#include <unistd.h>
#include <i915_drm.h>
-#include "igt_core.h"
#include "intel_chipset.h"
#include "i915/perf.h"
#include "i915/perf_data_reader.h"
diff --git a/tools/i915-perf/i915_perf_recorder.c b/tools/i915-perf/i915_perf_recorder.c
index 00195290..f6b7e625 100644
--- a/tools/i915-perf/i915_perf_recorder.c
+++ b/tools/i915-perf/i915_perf_recorder.c
@@ -21,7 +21,6 @@
*/
#include <assert.h>
-#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
#include <getopt.h>
@@ -35,9 +34,6 @@
#include <string.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
-#include <sys/sysmacros.h>
-#include <sys/time.h>
-#include <sys/types.h>
#include <time.h>
#include <unistd.h>
diff --git a/tools/igt_compliance_utils.c b/tools/igt_compliance_utils.c
index 0faf3fc8..e206740d 100644
--- a/tools/igt_compliance_utils.c
+++ b/tools/igt_compliance_utils.c
@@ -24,13 +24,10 @@
*/
#include "igt.h"
-#include <stdio.h>
#include <string.h>
-#include <stdlib.h>
#include <signal.h>
#include <termios.h>
#include <libgen.h>
-#include <sys/stat.h>
#include "igt_dp_compliance.h"
diff --git a/tools/igt_dp_compliance_hotplug.c b/tools/igt_dp_compliance_hotplug.c
index d05e45ca..3e0cf3d5 100644
--- a/tools/igt_dp_compliance_hotplug.c
+++ b/tools/igt_dp_compliance_hotplug.c
@@ -24,7 +24,6 @@
*/
#include "igt.h"
-#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/tools/igt_stats.c b/tools/igt_stats.c
index 105e9bc5..dc4e66ea 100644
--- a/tools/igt_stats.c
+++ b/tools/igt_stats.c
@@ -28,10 +28,7 @@
#include <stdlib.h>
#include <stdio.h>
-#include <stdint.h>
#include <string.h>
-#include <errno.h>
-#include <unistd.h>
#include "igt_stats.h"
diff --git a/tools/intel_audio_dump.c b/tools/intel_audio_dump.c
index 6d11659e..ecd14ad7 100644
--- a/tools/intel_audio_dump.c
+++ b/tools/intel_audio_dump.c
@@ -26,11 +26,8 @@
*
*/
-#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
-#include <string.h>
-#include <err.h>
#include <arpa/inet.h>
#include "intel_io.h"
#include "intel_reg.h"
diff --git a/tools/intel_backlight.c b/tools/intel_backlight.c
index edf06022..f5e8a3b5 100644
--- a/tools/intel_backlight.c
+++ b/tools/intel_backlight.c
@@ -28,7 +28,6 @@
#include <stdint.h>
#include <stdlib.h>
#include <stdio.h>
-#include <string.h>
#include "intel_io.h"
#include "intel_chipset.h"
diff --git a/tools/intel_bios_dumper.c b/tools/intel_bios_dumper.c
index 85bea97b..2c5246ee 100644
--- a/tools/intel_bios_dumper.c
+++ b/tools/intel_bios_dumper.c
@@ -28,7 +28,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <stdarg.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
diff --git a/tools/intel_display_poller.c b/tools/intel_display_poller.c
index 30d9242c..673a682a 100644
--- a/tools/intel_display_poller.c
+++ b/tools/intel_display_poller.c
@@ -23,19 +23,16 @@
*/
#include <assert.h>
-#include <fcntl.h>
#include <getopt.h>
#include <unistd.h>
#include <signal.h>
#include <stdbool.h>
#include <stdlib.h>
#include <stdio.h>
-#include <err.h>
#include <string.h>
#include "intel_chipset.h"
#include "intel_io.h"
#include "intel_reg.h"
-#include "igt_debugfs.h"
#include "drmtest.h"
#include "igt_aux.h"
diff --git a/tools/intel_dp_compliance.c b/tools/intel_dp_compliance.c
index 2e20d7f0..7390348f 100644
--- a/tools/intel_dp_compliance.c
+++ b/tools/intel_dp_compliance.c
@@ -109,27 +109,16 @@
#include "igt.h"
#include <errno.h>
#include <getopt.h>
-#include <math.h>
#include <stdint.h>
#include <stdbool.h>
#include <strings.h>
#include <unistd.h>
-#include <termios.h>
-#include <sys/poll.h>
-#include <sys/time.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
#include <sys/stat.h>
-#include <sys/select.h>
-#include <assert.h>
-#include <signal.h>
#include <fcntl.h>
-#include <time.h>
#include "igt_dp_compliance.h"
#include <stdlib.h>
-#include <signal.h>
/* User Input definitions */
#define HELP_DESCRIPTION 1
diff --git a/tools/intel_error_decode.c b/tools/intel_error_decode.c
index 90a18a07..bb16110e 100644
--- a/tools/intel_error_decode.c
+++ b/tools/intel_error_decode.c
@@ -41,7 +41,6 @@
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
-#include <stdarg.h>
#include <string.h>
#include <unistd.h>
#include <inttypes.h>
@@ -54,10 +53,8 @@
#include <ctype.h>
#include "intel_chipset.h"
-#include "intel_io.h"
#include "instdone.h"
#include "intel_reg.h"
-#include "drmtest.h"
static uint32_t
print_head(unsigned int reg)
diff --git a/tools/intel_firmware_decode.c b/tools/intel_firmware_decode.c
index 61ce3a53..b750a771 100644
--- a/tools/intel_firmware_decode.c
+++ b/tools/intel_firmware_decode.c
@@ -28,10 +28,7 @@
#include <inttypes.h>
#include <stdio.h>
#include <stdint.h>
-#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
#include <sys/mman.h>
#include <sys/stat.h>
diff --git a/tools/intel_forcewaked.c b/tools/intel_forcewaked.c
index 87b26d43..0864357c 100644
--- a/tools/intel_forcewaked.c
+++ b/tools/intel_forcewaked.c
@@ -26,9 +26,7 @@
*/
#include <assert.h>
-#include <err.h>
#include <string.h>
-#include <stdarg.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
@@ -36,7 +34,6 @@
#include <unistd.h>
#include "intel_io.h"
#include "intel_chipset.h"
-#include "drmtest.h"
bool daemonized;
diff --git a/tools/intel_framebuffer_dump.c b/tools/intel_framebuffer_dump.c
index 79c0688b..420167b8 100644
--- a/tools/intel_framebuffer_dump.c
+++ b/tools/intel_framebuffer_dump.c
@@ -26,15 +26,12 @@
* Read back all the KMS framebuffers attached to the CRTC and record as PNG.
*/
-#include <stdint.h>
-#include <sys/types.h>
#include <sys/mman.h>
#include <errno.h>
#include <xf86drmMode.h>
#include <i915_drm.h>
#include <cairo.h>
-#include "intel_io.h"
#include "drmtest.h"
int main(int argc, char **argv)
diff --git a/tools/intel_gem_info.c b/tools/intel_gem_info.c
index 75444438..3700d20e 100644
--- a/tools/intel_gem_info.c
+++ b/tools/intel_gem_info.c
@@ -1,8 +1,6 @@
#include "igt.h"
#include <sys/ioctl.h>
-#include <fcntl.h>
#include <errno.h>
-#include <string.h>
#include <signal.h>
#include <i915_drm.h>
diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c
index 26986a82..7c1c7444 100644
--- a/tools/intel_gpu_top.c
+++ b/tools/intel_gpu_top.c
@@ -40,7 +40,6 @@
#include <string.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
-#include <sys/types.h>
#include <unistd.h>
#include <termios.h>
#include <sys/sysmacros.h>
diff --git a/tools/intel_gtt.c b/tools/intel_gtt.c
index 311694ba..80ba0293 100644
--- a/tools/intel_gtt.c
+++ b/tools/intel_gtt.c
@@ -30,11 +30,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <stdarg.h>
#include <pciaccess.h>
-#include <unistd.h>
-#include "intel_io.h"
#include "intel_chipset.h"
#define KB(x) ((x) * 1024)
diff --git a/tools/intel_guc_logger.c b/tools/intel_guc_logger.c
index 5f1de8db..ec76eb30 100644
--- a/tools/intel_guc_logger.c
+++ b/tools/intel_guc_logger.c
@@ -26,18 +26,14 @@
#include <stdio.h>
#include <fcntl.h>
#include <sched.h>
-#include <sys/ioctl.h>
#include <string.h>
#include <errno.h>
#include <signal.h>
#include <stdlib.h>
#include <unistd.h>
#include <sys/poll.h>
-#include <sys/wait.h>
#include <sys/types.h>
-#include <sys/syscall.h>
#include <sys/mman.h>
-#include <assert.h>
#include <pthread.h>
#include "igt.h"
diff --git a/tools/intel_gvtg_test.c b/tools/intel_gvtg_test.c
index ad5ee6a6..4ede5f08 100644
--- a/tools/intel_gvtg_test.c
+++ b/tools/intel_gvtg_test.c
@@ -28,31 +28,16 @@
* TODO:
* Enable more GVT-g related test cases.
*/
-#include "config.h"
#include "igt.h"
#include <errno.h>
#include <getopt.h>
-#include <math.h>
-#include <stdint.h>
-#include <stdbool.h>
#include <strings.h>
#include <unistd.h>
-#include <termios.h>
-#include <sys/poll.h>
-#include <sys/time.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
#include <string.h>
#include <stdlib.h>
-#include <signal.h>
#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <unistd.h>
#include <pwd.h>
-#include <limits.h>
#include <dirent.h>
#define RANDOM(x) (rand() % x)
diff --git a/tools/intel_l3_parity.c b/tools/intel_l3_parity.c
index 8225b272..2faac29e 100644
--- a/tools/intel_l3_parity.c
+++ b/tools/intel_l3_parity.c
@@ -25,8 +25,6 @@
*
*/
-#include <sys/types.h>
-#include <sys/stat.h>
#include <assert.h>
#include <fcntl.h>
#include <stdio.h>
@@ -39,7 +37,6 @@
#include "igt_device.h"
#include "igt_sysfs.h"
#include "drmtest.h"
-#include "config.h"
#include <libudev.h>
#include <syslog.h>
#include "intel_l3_parity.h"
diff --git a/tools/intel_l3_udev_listener.c b/tools/intel_l3_udev_listener.c
index ff62f407..084ed689 100644
--- a/tools/intel_l3_udev_listener.c
+++ b/tools/intel_l3_udev_listener.c
@@ -21,13 +21,10 @@
* DEALINGS IN THE SOFTWARE.
*/
-#include "config.h"
-
#include <libudev.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include <assert.h>
#include <syslog.h>
#include "i915_drm.h"
diff --git a/tools/intel_lid.c b/tools/intel_lid.c
index 2a1d9800..a9b46d5f 100644
--- a/tools/intel_lid.c
+++ b/tools/intel_lid.c
@@ -28,14 +28,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <stdarg.h>
-#include <pciaccess.h>
-#include <err.h>
#include <fcntl.h>
#include <unistd.h>
#include <dirent.h>
-#include <sys/stat.h>
-#include <sys/types.h>
#include "intel_io.h"
#include "intel_reg.h"
diff --git a/tools/intel_opregion_decode.c b/tools/intel_opregion_decode.c
index b0a503e1..f75c3c4b 100644
--- a/tools/intel_opregion_decode.c
+++ b/tools/intel_opregion_decode.c
@@ -36,9 +36,7 @@
#include <unistd.h>
#include <sys/mman.h>
#include <sys/stat.h>
-#include <sys/types.h>
-#include "intel_io.h"
#include "drmtest.h"
#define OPREGION_HEADER_OFFSET 0
diff --git a/tools/intel_panel_fitter.c b/tools/intel_panel_fitter.c
index c6ee2101..6f65542a 100644
--- a/tools/intel_panel_fitter.c
+++ b/tools/intel_panel_fitter.c
@@ -29,11 +29,9 @@
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
-#include <string.h>
#include "intel_io.h"
#include "intel_chipset.h"
#include "intel_reg.h"
-#include "drmtest.h"
int gen;
diff --git a/tools/intel_perf_counters.c b/tools/intel_perf_counters.c
index d297f2e8..1b85c992 100644
--- a/tools/intel_perf_counters.c
+++ b/tools/intel_perf_counters.c
@@ -39,10 +39,7 @@
#include <stdbool.h>
#include <stdlib.h>
#include <stdio.h>
-#include <err.h>
-#include <sys/ioctl.h>
-#include "drm.h"
#include "i915_drm.h"
#include "igt_device.h"
#include "drmtest.h"
diff --git a/tools/intel_pm_rpm.c b/tools/intel_pm_rpm.c
index 53ad252d..85ae115a 100644
--- a/tools/intel_pm_rpm.c
+++ b/tools/intel_pm_rpm.c
@@ -22,10 +22,7 @@
*
*/
-#include <errno.h>
#include <getopt.h>
-#include <glib.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdbool.h>
diff --git a/tools/intel_reg.c b/tools/intel_reg.c
index 584a2ccd..6ff34b4e 100644
--- a/tools/intel_reg.c
+++ b/tools/intel_reg.c
@@ -29,7 +29,6 @@
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
-#include <sys/types.h>
#include <unistd.h>
#include "i915/gem_create.h"
diff --git a/tools/intel_reg_checker.c b/tools/intel_reg_checker.c
index 2aefabc6..01074a6d 100644
--- a/tools/intel_reg_checker.c
+++ b/tools/intel_reg_checker.c
@@ -21,10 +21,7 @@
*/
#include <unistd.h>
-#include <stdlib.h>
#include <stdio.h>
-#include <err.h>
-#include <string.h>
#include <stdbool.h>
#include "intel_io.h"
#include "intel_chipset.h"
diff --git a/tools/intel_residency.c b/tools/intel_residency.c
index 0932e362..1d329e1f 100644
--- a/tools/intel_residency.c
+++ b/tools/intel_residency.c
@@ -25,7 +25,6 @@
*/
#include <sys/time.h>
-#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <inttypes.h>
diff --git a/tools/intel_stepping.c b/tools/intel_stepping.c
index 7839ef59..88b37856 100644
--- a/tools/intel_stepping.c
+++ b/tools/intel_stepping.c
@@ -28,11 +28,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <stdarg.h>
#include <pciaccess.h>
#include <err.h>
#include "intel_chipset.h"
-#include "intel_io.h"
#include "intel_reg.h"
static void
diff --git a/tools/intel_vbt_decode.c b/tools/intel_vbt_decode.c
index b063af84..95641901 100644
--- a/tools/intel_vbt_decode.c
+++ b/tools/intel_vbt_decode.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 2006 Intel Corporation
+ * Copyright � 2006 Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -35,7 +35,6 @@
#include <unistd.h>
#include <sys/mman.h>
#include <sys/stat.h>
-#include <sys/types.h>
#include "igt_aux.h"
#include "intel_io.h"
diff --git a/tools/intel_watermark.c b/tools/intel_watermark.c
index 1e235ed3..51e1e8c0 100644
--- a/tools/intel_watermark.c
+++ b/tools/intel_watermark.c
@@ -27,7 +27,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <stdbool.h>
-#include <err.h>
#include <string.h>
#include "intel_io.h"
#include "intel_chipset.h"
diff --git a/tools/lsgpu.c b/tools/lsgpu.c
index 27e76f26..fefb13be 100644
--- a/tools/lsgpu.c
+++ b/tools/lsgpu.c
@@ -24,9 +24,6 @@
#include "igt_device_scan.h"
#include "igt.h"
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <errno.h>
#include <string.h>
#include <signal.h>
#include <glib.h>
diff --git a/tools/msm_dp_compliance.c b/tools/msm_dp_compliance.c
index 6941d385..e7d4524e 100644
--- a/tools/msm_dp_compliance.c
+++ b/tools/msm_dp_compliance.c
@@ -110,27 +110,16 @@
#include "igt.h"
#include <errno.h>
#include <getopt.h>
-#include <math.h>
#include <stdint.h>
#include <stdbool.h>
#include <strings.h>
#include <unistd.h>
-#include <termios.h>
-#include <sys/poll.h>
-#include <sys/time.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
#include <sys/stat.h>
-#include <sys/select.h>
-#include <assert.h>
-#include <signal.h>
#include <fcntl.h>
-#include <time.h>
#include "igt_dp_compliance.h"
#include <stdlib.h>
-#include <signal.h>
/* User Input definitions */
#define HELP_DESCRIPTION 1
diff --git a/tools/null_state_gen/intel_batchbuffer.c b/tools/null_state_gen/intel_batchbuffer.c
index 2ead22e1..7f5de7ad 100644
--- a/tools/null_state_gen/intel_batchbuffer.c
+++ b/tools/null_state_gen/intel_batchbuffer.c
@@ -31,7 +31,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <errno.h>
#include <assert.h>
#include "intel_batchbuffer.h"
diff --git a/tools/null_state_gen/intel_null_state_gen.c b/tools/null_state_gen/intel_null_state_gen.c
index 7d5887eb..9cefe183 100644
--- a/tools/null_state_gen/intel_null_state_gen.c
+++ b/tools/null_state_gen/intel_null_state_gen.c
@@ -28,7 +28,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
-#include <assert.h>
#include "intel_renderstate.h"
#include "intel_batchbuffer.h"
diff --git a/tools/null_state_gen/intel_renderstate_gen8.c b/tools/null_state_gen/intel_renderstate_gen8.c
index 17822c44..de2ef06f 100644
--- a/tools/null_state_gen/intel_renderstate_gen8.c
+++ b/tools/null_state_gen/intel_renderstate_gen8.c
@@ -28,7 +28,6 @@
#include "intel_batchbuffer.h"
#include <lib/gen8_render.h>
#include <lib/intel_reg.h>
-#include <string.h>
static void gen8_emit_wm(struct intel_batchbuffer *batch)
{
diff --git a/tools/skl_compute_wrpll.c b/tools/skl_compute_wrpll.c
index 0e5965cf..65438aed 100644
--- a/tools/skl_compute_wrpll.c
+++ b/tools/skl_compute_wrpll.c
@@ -23,11 +23,9 @@
#include <assert.h>
#include <inttypes.h>
-#include <limits.h>
#include <stdio.h>
#include <stdbool.h>
#include <stdint.h>
-#include <stdlib.h>
#include <string.h>
#include "igt_stats.h"
--
2.36.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [igt-dev] [PATCH i-g-t 13/14] tests/i915/gem*: Remove unused headers
2022-05-31 14:28 [igt-dev] [PATCH i-g-t 01/14] lib: Remove unused headers Ryszard Knop
` (10 preceding siblings ...)
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 12/14] tools: " Ryszard Knop
@ 2022-05-31 14:28 ` Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 14/14] tests/i915/*: " Ryszard Knop
12 siblings, 0 replies; 14+ messages in thread
From: Ryszard Knop @ 2022-05-31 14:28 UTC (permalink / raw)
To: Development mailing list for IGT GPU Tools
Using CLion's automated code inspection, most unused includes were found
and removed. Some warnings remain as CLion is unable to track code usage
across certain attributes, but the vast majority of unneeded headers are
now gone.
Signed-off-by: Ryszard Knop <ryszard.knop@intel.com>
---
tests/i915/gem_bad_reloc.c | 11 +----------
tests/i915/gem_basic.c | 4 ----
tests/i915/gem_caching.c | 7 -------
tests/i915/gem_ccs.c | 5 +----
tests/i915/gem_close_race.c | 6 ------
tests/i915/gem_concurrent_all.c | 4 ----
tests/i915/gem_create.c | 7 -------
tests/i915/gem_cs_tlb.c | 5 -----
tests/i915/gem_ctx_bad_destroy.c | 2 +-
tests/i915/gem_ctx_engines.c | 5 -----
tests/i915/gem_ctx_exec.c | 4 ----
tests/i915/gem_ctx_freq.c | 4 ----
tests/i915/gem_ctx_persistence.c | 1 -
tests/i915/gem_ctx_shared.c | 8 --------
tests/i915/gem_ctx_sseu.c | 6 ------
tests/i915/gem_ctx_switch.c | 6 ------
tests/i915/gem_eio.c | 2 --
tests/i915/gem_evict_alignment.c | 8 --------
tests/i915/gem_evict_everything.c | 9 +--------
tests/i915/gem_exec_alignment.c | 3 ---
tests/i915/gem_exec_await.c | 4 ----
tests/i915/gem_exec_balancer.c | 1 -
tests/i915/gem_exec_big.c | 7 -------
tests/i915/gem_exec_capture.c | 1 -
tests/i915/gem_exec_create.c | 7 -------
tests/i915/gem_exec_endless.c | 1 -
tests/i915/gem_exec_fair.c | 8 --------
tests/i915/gem_exec_fence.c | 1 -
tests/i915/gem_exec_latency.c | 9 ---------
tests/i915/gem_exec_lut_handle.c | 6 ------
tests/i915/gem_exec_nop.c | 7 -------
tests/i915/gem_exec_params.c | 5 -----
tests/i915/gem_exec_reloc.c | 2 --
tests/i915/gem_exec_schedule.c | 3 ---
tests/i915/gem_fd_exhaustion.c | 6 +-----
tests/i915/gem_fence_thrash.c | 7 -------
tests/i915/gem_fence_upload.c | 6 ------
tests/i915/gem_fenced_exec_thrash.c | 1 -
tests/i915/gem_flink_basic.c | 6 +-----
tests/i915/gem_gpgpu_fill.c | 9 ---------
tests/i915/gem_gtt_cpu_tlb.c | 7 -------
tests/i915/gem_gtt_hog.c | 7 -------
tests/i915/gem_gtt_speed.c | 7 -------
tests/i915/gem_huc_copy.c | 7 -------
tests/i915/gem_linear_blits.c | 7 -------
tests/i915/gem_lmem_swapping.c | 6 ------
tests/i915/gem_lut_handle.c | 5 -----
tests/i915/gem_madvise.c | 4 ----
tests/i915/gem_media_fill.c | 8 --------
tests/i915/gem_media_vme.c | 9 ---------
tests/i915/gem_mmap.c | 4 ----
tests/i915/gem_mmap_gtt.c | 1 -
tests/i915/gem_mmap_offset.c | 1 -
tests/i915/gem_mmap_wc.c | 5 -----
tests/i915/gem_partial_pwrite_pread.c | 6 ------
tests/i915/gem_pipe_control_store_loop.c | 6 ------
tests/i915/gem_ppgtt.c | 7 -------
tests/i915/gem_pread.c | 2 --
tests/i915/gem_pread_after_blit.c | 7 -------
tests/i915/gem_pwrite.c | 2 --
tests/i915/gem_pwrite_snooped.c | 10 +---------
tests/i915/gem_read_read_speed.c | 7 -------
tests/i915/gem_readwrite.c | 4 ----
tests/i915/gem_reg_read.c | 1 -
tests/i915/gem_render_copy.c | 9 ---------
tests/i915/gem_render_copy_redux.c | 9 ---------
tests/i915/gem_render_linear_blits.c | 10 ----------
tests/i915/gem_render_tiled_blits.c | 9 ---------
tests/i915/gem_request_retire.c | 13 -------------
tests/i915/gem_reset_stats.c | 4 ----
tests/i915/gem_ringfill.c | 2 --
tests/i915/gem_set_tiling_vs_blt.c | 7 -------
tests/i915/gem_set_tiling_vs_gtt.c | 7 -------
tests/i915/gem_set_tiling_vs_pwrite.c | 7 -------
tests/i915/gem_streaming_writes.c | 9 +--------
tests/i915/gem_stress.c | 8 --------
tests/i915/gem_sync.c | 1 -
tests/i915/gem_tiled_blits.c | 7 -------
tests/i915/gem_tiled_partial_pwrite_pread.c | 6 ------
tests/i915/gem_tiled_pread_basic.c | 7 -------
tests/i915/gem_tiled_pread_pwrite.c | 8 --------
tests/i915/gem_tiled_swapping.c | 7 -------
tests/i915/gem_tiled_wb.c | 5 -----
tests/i915/gem_tiled_wc.c | 4 ----
tests/i915/gem_tiling_max_stride.c | 5 -----
tests/i915/gem_unfence_active_buffers.c | 8 --------
tests/i915/gem_unref_active_buffers.c | 1 -
tests/i915/gem_userptr_blits.c | 1 -
tests/i915/gem_vm_create.c | 1 -
tests/i915/gem_watchdog.c | 2 --
90 files changed, 8 insertions(+), 483 deletions(-)
diff --git a/tests/i915/gem_bad_reloc.c b/tests/i915/gem_bad_reloc.c
index 478e78a6..6bc321b9 100644
--- a/tests/i915/gem_bad_reloc.c
+++ b/tests/i915/gem_bad_reloc.c
@@ -26,18 +26,9 @@
*/
#include <unistd.h>
-#include <stdlib.h>
#include <stdint.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-
-#include "drm.h"
+
#include "i915/gem.h"
#include "i915/gem_create.h"
#include "igt.h"
diff --git a/tests/i915/gem_basic.c b/tests/i915/gem_basic.c
index 17ae190c..5b262bf7 100644
--- a/tests/i915/gem_basic.c
+++ b/tests/i915/gem_basic.c
@@ -27,13 +27,9 @@
#include "igt.h"
#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
#include <sys/ioctl.h>
#include "drm.h"
diff --git a/tests/i915/gem_caching.c b/tests/i915/gem_caching.c
index eb0170ab..d0bbf939 100644
--- a/tests/i915/gem_caching.c
+++ b/tests/i915/gem_caching.c
@@ -27,15 +27,8 @@
*/
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-
-#include <drm.h>
#include "i915/gem.h"
#include "igt.h"
diff --git a/tests/i915/gem_ccs.c b/tests/i915/gem_ccs.c
index 4ecb3e36..c0db9c05 100644
--- a/tests/i915/gem_ccs.c
+++ b/tests/i915/gem_ccs.c
@@ -3,12 +3,9 @@
* Copyright © 2022 Intel Corporation
*/
-#include <errno.h>
#include <glib.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
#include <malloc.h>
-#include "drm.h"
+
#include "igt.h"
#include "i915/gem.h"
#include "i915/gem_create.h"
diff --git a/tests/i915/gem_close_race.c b/tests/i915/gem_close_race.c
index 93ae07ed..84d4b3c3 100644
--- a/tests/i915/gem_close_race.c
+++ b/tests/i915/gem_close_race.c
@@ -31,15 +31,9 @@
#include <stdbool.h>
#include <stdlib.h>
#include <stdint.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <sys/time.h>
-#include <sys/syscall.h>
#include "drm.h"
#include "i915/gem.h"
diff --git a/tests/i915/gem_concurrent_all.c b/tests/i915/gem_concurrent_all.c
index 2b1788e1..0e104ebc 100644
--- a/tests/i915/gem_concurrent_all.c
+++ b/tests/i915/gem_concurrent_all.c
@@ -39,11 +39,7 @@
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
-#include <inttypes.h>
#include <errno.h>
-#include <sys/resource.h>
-#include <sys/stat.h>
-#include <sys/time.h>
#include <sys/wait.h>
#include <drm.h>
diff --git a/tests/i915/gem_create.c b/tests/i915/gem_create.c
index 31fd6526..57dcce3e 100644
--- a/tests/i915/gem_create.c
+++ b/tests/i915/gem_create.c
@@ -32,15 +32,10 @@
*/
#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
#include <sys/time.h>
-#include <getopt.h>
#include <pthread.h>
#include <stdatomic.h>
@@ -48,8 +43,6 @@
#include "drmtest.h"
#include "ioctl_wrappers.h"
#include "intel_batchbuffer.h"
-#include "intel_io.h"
-#include "intel_chipset.h"
#include "igt_aux.h"
#include "igt_dummyload.h"
#include "igt_x86.h"
diff --git a/tests/i915/gem_cs_tlb.c b/tests/i915/gem_cs_tlb.c
index 2117b41e..b2a52ce1 100644
--- a/tests/i915/gem_cs_tlb.c
+++ b/tests/i915/gem_cs_tlb.c
@@ -36,15 +36,10 @@
*/
#include <unistd.h>
-#include <stdlib.h>
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <sys/time.h>
#include <drm.h>
diff --git a/tests/i915/gem_ctx_bad_destroy.c b/tests/i915/gem_ctx_bad_destroy.c
index 50bb9aa0..21882994 100644
--- a/tests/i915/gem_ctx_bad_destroy.c
+++ b/tests/i915/gem_ctx_bad_destroy.c
@@ -30,7 +30,7 @@
*/
#include "igt.h"
-#include <stdio.h>
+
#include <string.h>
#include <errno.h>
diff --git a/tests/i915/gem_ctx_engines.c b/tests/i915/gem_ctx_engines.c
index 19cf9b05..be480c2d 100644
--- a/tests/i915/gem_ctx_engines.c
+++ b/tests/i915/gem_ctx_engines.c
@@ -27,13 +27,8 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
#include <errno.h>
#include <sched.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/time.h>
#include <drm.h>
diff --git a/tests/i915/gem_ctx_exec.c b/tests/i915/gem_ctx_exec.c
index 1f3d1a44..79bcadee 100644
--- a/tests/i915/gem_ctx_exec.c
+++ b/tests/i915/gem_ctx_exec.c
@@ -29,12 +29,8 @@
#include <signal.h>
#include <stdlib.h>
#include <stdint.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/time.h>
diff --git a/tests/i915/gem_ctx_freq.c b/tests/i915/gem_ctx_freq.c
index a29fe68b..b68571a7 100644
--- a/tests/i915/gem_ctx_freq.c
+++ b/tests/i915/gem_ctx_freq.c
@@ -22,10 +22,7 @@
*
*/
-#include <errno.h>
-#include <fcntl.h>
#include <sched.h>
-#include <stdlib.h>
#include <stdint.h>
#include <unistd.h>
@@ -33,7 +30,6 @@
#include "igt.h"
#include "igt_perf.h"
#include "igt_sysfs.h"
-#include "sw_sync.h"
#define SAMPLE_PERIOD (USEC_PER_SEC / 10)
#define PMU_TOLERANCE 100
diff --git a/tests/i915/gem_ctx_persistence.c b/tests/i915/gem_ctx_persistence.c
index 00dda3a8..51381b89 100644
--- a/tests/i915/gem_ctx_persistence.c
+++ b/tests/i915/gem_ctx_persistence.c
@@ -27,7 +27,6 @@
#include <signal.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
-#include <sys/types.h>
#include <unistd.h>
#include "drmtest.h"
diff --git a/tests/i915/gem_ctx_shared.c b/tests/i915/gem_ctx_shared.c
index eb3b024f..c363b1f8 100644
--- a/tests/i915/gem_ctx_shared.c
+++ b/tests/i915/gem_ctx_shared.c
@@ -28,14 +28,7 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-
-#include <drm.h>
#include "i915/gem.h"
#include "i915/gem_create.h"
@@ -43,7 +36,6 @@
#include "i915/gem_vm.h"
#include "igt.h"
#include "igt_rand.h"
-#include "igt_vgem.h"
#include "sw_sync.h"
#include "sync_file.h"
diff --git a/tests/i915/gem_ctx_sseu.c b/tests/i915/gem_ctx_sseu.c
index 7685511f..dd0b4711 100644
--- a/tests/i915/gem_ctx_sseu.c
+++ b/tests/i915/gem_ctx_sseu.c
@@ -26,20 +26,14 @@
*/
#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
#include <errno.h>
-#include <time.h>
#include <sys/mman.h>
-#include <sys/wait.h>
#include "i915/gem.h"
#include "i915/gem_create.h"
#include "igt.h"
-#include "igt.h"
#include "igt_dummyload.h"
#include "igt_perf.h"
#include "igt_sysfs.h"
diff --git a/tests/i915/gem_ctx_switch.c b/tests/i915/gem_ctx_switch.c
index 4e46b763..899cedfc 100644
--- a/tests/i915/gem_ctx_switch.c
+++ b/tests/i915/gem_ctx_switch.c
@@ -31,15 +31,9 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <sys/time.h>
#include <time.h>
-#include "drm.h"
#include "i915/gem.h"
#include "i915/gem_create.h"
#include "i915/gem_ring.h"
diff --git a/tests/i915/gem_eio.c b/tests/i915/gem_eio.c
index 913a21f9..ef6084f4 100644
--- a/tests/i915/gem_eio.c
+++ b/tests/i915/gem_eio.c
@@ -30,13 +30,11 @@
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
-#include <inttypes.h>
#include <sched.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <sys/ioctl.h>
#include <time.h>
#include <unistd.h>
diff --git a/tests/i915/gem_evict_alignment.c b/tests/i915/gem_evict_alignment.c
index 4a05f7cd..3ad4b35d 100644
--- a/tests/i915/gem_evict_alignment.c
+++ b/tests/i915/gem_evict_alignment.c
@@ -33,16 +33,8 @@
#include <unistd.h>
#include <stdlib.h>
#include <stdint.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-
-#include <drm.h>
#include "i915/gem.h"
#include "i915/gem_create.h"
diff --git a/tests/i915/gem_evict_everything.c b/tests/i915/gem_evict_everything.c
index 37343b53..8f0fa9be 100644
--- a/tests/i915/gem_evict_everything.c
+++ b/tests/i915/gem_evict_everything.c
@@ -35,14 +35,7 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-
-#include "drm.h"
+
#include "i915/gem.h"
#include "i915/gem_create.h"
#include "igt.h"
diff --git a/tests/i915/gem_exec_alignment.c b/tests/i915/gem_exec_alignment.c
index c88fc327..3e283e4a 100644
--- a/tests/i915/gem_exec_alignment.c
+++ b/tests/i915/gem_exec_alignment.c
@@ -30,14 +30,11 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
#include <signal.h>
-#include <sys/stat.h>
#include <sys/time.h>
#include <sys/ioctl.h>
-#include <signal.h>
#include <sched.h>
#include "drm.h"
diff --git a/tests/i915/gem_exec_await.c b/tests/i915/gem_exec_await.c
index fe176595..571796cb 100644
--- a/tests/i915/gem_exec_await.c
+++ b/tests/i915/gem_exec_await.c
@@ -22,15 +22,11 @@
*
*/
-#include <sys/ioctl.h>
#include <sys/signal.h>
#include "i915/gem.h"
#include "i915/gem_create.h"
#include "igt.h"
-#include "igt_rand.h"
-#include "igt_sysfs.h"
-#include "igt_vgem.h"
static double elapsed(const struct timespec *start, const struct timespec *end)
{
diff --git a/tests/i915/gem_exec_balancer.c b/tests/i915/gem_exec_balancer.c
index 857d0085..b646a076 100644
--- a/tests/i915/gem_exec_balancer.c
+++ b/tests/i915/gem_exec_balancer.c
@@ -30,7 +30,6 @@
#include "i915/gem.h"
#include "i915/gem_engine_topology.h"
#include "i915/gem_create.h"
-#include "i915/gem_vm.h"
#include "igt.h"
#include "igt_gt.h"
#include "igt_perf.h"
diff --git a/tests/i915/gem_exec_big.c b/tests/i915/gem_exec_big.c
index 2f47de39..8296197f 100644
--- a/tests/i915/gem_exec_big.c
+++ b/tests/i915/gem_exec_big.c
@@ -35,16 +35,9 @@
#include <unistd.h>
#include <stdlib.h>
#include <stdint.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include "drm.h"
#include "i915/gem.h"
#include "i915/gem_create.h"
#include "igt.h"
diff --git a/tests/i915/gem_exec_capture.c b/tests/i915/gem_exec_capture.c
index 60f8df04..9b399e26 100644
--- a/tests/i915/gem_exec_capture.c
+++ b/tests/i915/gem_exec_capture.c
@@ -29,7 +29,6 @@
#include "i915/gem_create.h"
#include "igt.h"
#include "igt_device.h"
-#include "igt_rand.h"
#include "igt_sysfs.h"
#define MAX_RESET_TIME 600
diff --git a/tests/i915/gem_exec_create.c b/tests/i915/gem_exec_create.c
index 78d5ffb3..368fdc86 100644
--- a/tests/i915/gem_exec_create.c
+++ b/tests/i915/gem_exec_create.c
@@ -30,17 +30,10 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <sys/time.h>
#include <time.h>
-#include "drm.h"
#include "i915/gem.h"
-#include "i915/gem_create.h"
#include "i915/gem_ring.h"
#include "igt.h"
diff --git a/tests/i915/gem_exec_endless.c b/tests/i915/gem_exec_endless.c
index b83d5a2c..f1c1c44d 100644
--- a/tests/i915/gem_exec_endless.c
+++ b/tests/i915/gem_exec_endless.c
@@ -28,7 +28,6 @@
#include "igt.h"
#include "igt_device.h"
#include "igt_sysfs.h"
-#include "sw_sync.h"
#define MAX_ENGINES 64
diff --git a/tests/i915/gem_exec_fair.c b/tests/i915/gem_exec_fair.c
index 935f9c4a..d4a475a6 100644
--- a/tests/i915/gem_exec_fair.c
+++ b/tests/i915/gem_exec_fair.c
@@ -3,16 +3,11 @@
* Copyright © 2016 Intel Corporation
*/
-#include "config.h"
-
#include <pthread.h>
#include <sys/poll.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <sys/resource.h>
-#include <sys/syscall.h>
-#include <sched.h>
-#include <signal.h>
#include <unistd.h>
#include "sync_file.h"
@@ -20,11 +15,8 @@
#include "i915/gem.h"
#include "i915/gem_create.h"
#include "igt.h"
-#include "igt_rand.h"
-#include "igt_rapl.h"
#include "igt_sysfs.h"
#include "igt_syncobj.h"
-#include "igt_vgem.h"
#include "ioctl_wrappers.h"
#include "sw_sync.h"
diff --git a/tests/i915/gem_exec_fence.c b/tests/i915/gem_exec_fence.c
index 47ddf308..9669ac7e 100644
--- a/tests/i915/gem_exec_fence.c
+++ b/tests/i915/gem_exec_fence.c
@@ -31,7 +31,6 @@
#include "igt_store.h"
#include "igt_syncobj.h"
#include "igt_sysfs.h"
-#include "igt_vgem.h"
#include "intel_ctx.h"
#include "sw_sync.h"
diff --git a/tests/i915/gem_exec_latency.c b/tests/i915/gem_exec_latency.c
index fcdf7787..e187a5c7 100644
--- a/tests/i915/gem_exec_latency.c
+++ b/tests/i915/gem_exec_latency.c
@@ -27,14 +27,6 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/signal.h>
-#include <time.h>
#include <sched.h>
#include "drm.h"
@@ -42,7 +34,6 @@
#include "igt.h"
#include "igt_device.h"
#include "igt_sysfs.h"
-#include "igt_vgem.h"
#include "igt_dummyload.h"
#include "igt_stats.h"
diff --git a/tests/i915/gem_exec_lut_handle.c b/tests/i915/gem_exec_lut_handle.c
index 06430866..a4b0c088 100644
--- a/tests/i915/gem_exec_lut_handle.c
+++ b/tests/i915/gem_exec_lut_handle.c
@@ -27,16 +27,10 @@
/* Exercises the basic execbuffer using the handle LUT interface */
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
#include <sys/time.h>
-#include "drm.h"
#include "i915/gem.h"
#include "i915/gem_create.h"
#include "igt.h"
diff --git a/tests/i915/gem_exec_nop.c b/tests/i915/gem_exec_nop.c
index f35cc840..7fa36851 100644
--- a/tests/i915/gem_exec_nop.c
+++ b/tests/i915/gem_exec_nop.c
@@ -30,16 +30,9 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <sys/poll.h>
-#include <sys/time.h>
#include <time.h>
-#include "drm.h"
#include "i915/gem.h"
#include "i915/gem_create.h"
#include "igt.h"
diff --git a/tests/i915/gem_exec_params.c b/tests/i915/gem_exec_params.c
index da36af74..57be5d0c 100644
--- a/tests/i915/gem_exec_params.c
+++ b/tests/i915/gem_exec_params.c
@@ -28,14 +28,9 @@
#include <unistd.h>
#include <stdlib.h>
#include <stdint.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
#include <sys/ioctl.h>
-#include <sys/time.h>
#include "drm.h"
#include "i915/gem.h"
diff --git a/tests/i915/gem_exec_reloc.c b/tests/i915/gem_exec_reloc.c
index 03d65dc6..4aafe7f9 100644
--- a/tests/i915/gem_exec_reloc.c
+++ b/tests/i915/gem_exec_reloc.c
@@ -22,7 +22,6 @@
*/
#include <signal.h>
-#include <sys/ioctl.h>
#include "i915/gem.h"
#include "i915/gem_create.h"
@@ -30,7 +29,6 @@
#include "igt_device.h"
#include "igt_dummyload.h"
#include "igt_kms.h"
-#include "sw_sync.h"
IGT_TEST_DESCRIPTION("Basic sanity check of execbuf-ioctl relocations.");
diff --git a/tests/i915/gem_exec_schedule.c b/tests/i915/gem_exec_schedule.c
index cf2625cb..f03091b9 100644
--- a/tests/i915/gem_exec_schedule.c
+++ b/tests/i915/gem_exec_schedule.c
@@ -21,8 +21,6 @@
* IN THE SOFTWARE.
*/
-#include "config.h"
-
#include <linux/userfaultfd.h>
#include <pthread.h>
@@ -41,7 +39,6 @@
#include "igt_rand.h"
#include "igt_rapl.h"
#include "igt_sysfs.h"
-#include "igt_vgem.h"
#include "intel_ctx.h"
#include "sw_sync.h"
diff --git a/tests/i915/gem_fd_exhaustion.c b/tests/i915/gem_fd_exhaustion.c
index a6463685..ff4b2f74 100644
--- a/tests/i915/gem_fd_exhaustion.c
+++ b/tests/i915/gem_fd_exhaustion.c
@@ -26,12 +26,8 @@
*/
#include "igt.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/resource.h>
-#include <sys/time.h>
+
#include <fcntl.h>
-#include <limits.h>
#include "i915/gem_create.h"
diff --git a/tests/i915/gem_fence_thrash.c b/tests/i915/gem_fence_thrash.c
index 89a5ae29..6543295e 100644
--- a/tests/i915/gem_fence_thrash.c
+++ b/tests/i915/gem_fence_thrash.c
@@ -26,19 +26,12 @@
*
*/
-#include "config.h"
-
#include <unistd.h>
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <pthread.h>
-#include "drm.h"
#include "i915/gem_create.h"
#include "igt.h"
diff --git a/tests/i915/gem_fence_upload.c b/tests/i915/gem_fence_upload.c
index 67487d67..3fecf260 100644
--- a/tests/i915/gem_fence_upload.c
+++ b/tests/i915/gem_fence_upload.c
@@ -25,20 +25,14 @@
*
*/
-#include "config.h"
-
#include "igt.h"
-#include <unistd.h>
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
#include <sys/time.h>
#include <pthread.h>
-#include "drm.h"
#include "i915_drm.h"
#include "i915/gem_create.h"
diff --git a/tests/i915/gem_fenced_exec_thrash.c b/tests/i915/gem_fenced_exec_thrash.c
index a9597d80..16bf007f 100644
--- a/tests/i915/gem_fenced_exec_thrash.c
+++ b/tests/i915/gem_fenced_exec_thrash.c
@@ -27,7 +27,6 @@
#include <stdlib.h>
#include <string.h>
-#include <inttypes.h>
#include <errno.h>
#include "i915/gem.h"
diff --git a/tests/i915/gem_flink_basic.c b/tests/i915/gem_flink_basic.c
index 4e207c2a..cc4e893e 100644
--- a/tests/i915/gem_flink_basic.c
+++ b/tests/i915/gem_flink_basic.c
@@ -26,13 +26,9 @@
*/
#include "igt.h"
-#include <stdlib.h>
-#include <stdio.h>
+
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
#include <sys/ioctl.h>
#include "drm.h"
diff --git a/tests/i915/gem_gpgpu_fill.c b/tests/i915/gem_gpgpu_fill.c
index 74a227f6..bd8a94b5 100644
--- a/tests/i915/gem_gpgpu_fill.c
+++ b/tests/i915/gem_gpgpu_fill.c
@@ -30,19 +30,10 @@
* workload for the GPGPU pipeline.
*/
-#include <stdbool.h>
-#include <unistd.h>
#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include "drm.h"
#include "i915/gem.h"
#include "igt.h"
#include "igt_collection.h"
diff --git a/tests/i915/gem_gtt_cpu_tlb.c b/tests/i915/gem_gtt_cpu_tlb.c
index 8000e58c..5dfc0baa 100644
--- a/tests/i915/gem_gtt_cpu_tlb.c
+++ b/tests/i915/gem_gtt_cpu_tlb.c
@@ -32,16 +32,9 @@
#include "igt.h"
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/ioctl.h>
-#include "drm.h"
#include "i915/gem_create.h"
IGT_TEST_DESCRIPTION("Check whether gtt tlbs for cpu access are correctly"
diff --git a/tests/i915/gem_gtt_hog.c b/tests/i915/gem_gtt_hog.c
index 15a6139e..902acf8f 100644
--- a/tests/i915/gem_gtt_hog.c
+++ b/tests/i915/gem_gtt_hog.c
@@ -28,15 +28,8 @@
#include <unistd.h>
#include <stdlib.h>
#include <stdint.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <sys/time.h>
-#include <sys/wait.h>
#include "drm.h"
#include "i915/gem.h"
diff --git a/tests/i915/gem_gtt_speed.c b/tests/i915/gem_gtt_speed.c
index 272091fd..6ba2fcb9 100644
--- a/tests/i915/gem_gtt_speed.c
+++ b/tests/i915/gem_gtt_speed.c
@@ -31,16 +31,9 @@
#include <unistd.h>
#include <stdlib.h>
#include <stdint.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <sys/time.h>
-#include "drm.h"
#include "i915/gem_create.h"
#define OBJECT_SIZE 16384
diff --git a/tests/i915/gem_huc_copy.c b/tests/i915/gem_huc_copy.c
index ea32b705..3c42fa1e 100644
--- a/tests/i915/gem_huc_copy.c
+++ b/tests/i915/gem_huc_copy.c
@@ -21,17 +21,10 @@
* IN THE SOFTWARE.
*/
#include "igt.h"
-#include <stdbool.h>
#include <unistd.h>
#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
#include "drm.h"
#include "i915/gem.h"
#include "i915/gem_create.h"
diff --git a/tests/i915/gem_linear_blits.c b/tests/i915/gem_linear_blits.c
index 9f049863..bed7abf1 100644
--- a/tests/i915/gem_linear_blits.c
+++ b/tests/i915/gem_linear_blits.c
@@ -34,15 +34,8 @@
*/
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-
-#include <drm.h>
#include "i915/gem.h"
#include "i915/gem_create.h"
diff --git a/tests/i915/gem_lmem_swapping.c b/tests/i915/gem_lmem_swapping.c
index 5d93e9da..d081f8fa 100644
--- a/tests/i915/gem_lmem_swapping.c
+++ b/tests/i915/gem_lmem_swapping.c
@@ -5,7 +5,6 @@
#include "i915/gem.h"
#include "i915/gem_create.h"
-#include "i915/gem_vm.h"
#include "i915/intel_memory_region.h"
#include "igt.h"
#include "igt_kmod.h"
@@ -14,14 +13,9 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <sys/time.h>
#include <sys/wait.h>
-#include "drm.h"
#include "i915/i915_blt.h"
#include "i915/intel_mocs.h"
diff --git a/tests/i915/gem_lut_handle.c b/tests/i915/gem_lut_handle.c
index 32f76aaa..c3361c72 100644
--- a/tests/i915/gem_lut_handle.c
+++ b/tests/i915/gem_lut_handle.c
@@ -29,15 +29,10 @@
#include "igt.h"
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include "drm.h"
#include "i915/gem_create.h"
IGT_TEST_DESCRIPTION("Exercises the basic execbuffer using the handle LUT"
diff --git a/tests/i915/gem_madvise.c b/tests/i915/gem_madvise.c
index 2502d84c..5567ec1f 100644
--- a/tests/i915/gem_madvise.c
+++ b/tests/i915/gem_madvise.c
@@ -27,16 +27,12 @@
#include "igt.h"
#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
#include <setjmp.h>
#include <signal.h>
-#include "drm.h"
#include "i915/gem_create.h"
IGT_TEST_DESCRIPTION("Checks that the kernel reports EFAULT when trying to use"
diff --git a/tests/i915/gem_media_fill.c b/tests/i915/gem_media_fill.c
index 1d08df24..35473b79 100644
--- a/tests/i915/gem_media_fill.c
+++ b/tests/i915/gem_media_fill.c
@@ -30,19 +30,11 @@
* workload for the Media pipeline.
*/
-#include <stdbool.h>
-#include <unistd.h>
#include <stdlib.h>
-#include <sys/ioctl.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include "drm.h"
#include "i915/gem.h"
#include "igt.h"
diff --git a/tests/i915/gem_media_vme.c b/tests/i915/gem_media_vme.c
index 3ea70386..30a149c9 100644
--- a/tests/i915/gem_media_vme.c
+++ b/tests/i915/gem_media_vme.c
@@ -20,19 +20,10 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
-#include <stdbool.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include "drm.h"
#include "i915/gem.h"
#include "igt.h"
diff --git a/tests/i915/gem_mmap.c b/tests/i915/gem_mmap.c
index 297ae3ad..8b86be6f 100644
--- a/tests/i915/gem_mmap.c
+++ b/tests/i915/gem_mmap.c
@@ -28,13 +28,9 @@
#include "igt.h"
#include <unistd.h>
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include "drm.h"
#include "i915/gem_create.h"
diff --git a/tests/i915/gem_mmap_gtt.c b/tests/i915/gem_mmap_gtt.c
index 92bbb5d2..57a51f7a 100644
--- a/tests/i915/gem_mmap_gtt.c
+++ b/tests/i915/gem_mmap_gtt.c
@@ -37,7 +37,6 @@
#include <signal.h>
#include <sys/ioctl.h>
#include <sys/ptrace.h>
-#include <sys/stat.h>
#include <sys/wait.h>
#include "drm.h"
diff --git a/tests/i915/gem_mmap_offset.c b/tests/i915/gem_mmap_offset.c
index abb6ee4e..5aa26f5f 100644
--- a/tests/i915/gem_mmap_offset.c
+++ b/tests/i915/gem_mmap_offset.c
@@ -28,7 +28,6 @@
#include <stdatomic.h>
#include <sys/ioctl.h>
#include <sys/ptrace.h>
-#include <sys/stat.h>
#include <sys/wait.h>
#include <unistd.h>
#include "drm.h"
diff --git a/tests/i915/gem_mmap_wc.c b/tests/i915/gem_mmap_wc.c
index 6dc7bae4..c6df3ca2 100644
--- a/tests/i915/gem_mmap_wc.c
+++ b/tests/i915/gem_mmap_wc.c
@@ -27,15 +27,10 @@
#include "igt.h"
#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <pthread.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include "drm.h"
#include "i915/gem_create.h"
diff --git a/tests/i915/gem_partial_pwrite_pread.c b/tests/i915/gem_partial_pwrite_pread.c
index 474149d4..90e494e0 100644
--- a/tests/i915/gem_partial_pwrite_pread.c
+++ b/tests/i915/gem_partial_pwrite_pread.c
@@ -28,13 +28,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-
-#include <drm.h>
#include "i915/gem.h"
#include "igt.h"
diff --git a/tests/i915/gem_pipe_control_store_loop.c b/tests/i915/gem_pipe_control_store_loop.c
index 305ac7ae..d8105549 100644
--- a/tests/i915/gem_pipe_control_store_loop.c
+++ b/tests/i915/gem_pipe_control_store_loop.c
@@ -31,16 +31,10 @@
* Writes a counter-value into an always newly allocated target bo (by disabling
* buffer reuse). Decently trashes on tlb inconsistencies, too.
*/
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
#include <sys/time.h>
-#include "drm.h"
#include "i915/gem.h"
#include "igt.h"
diff --git a/tests/i915/gem_ppgtt.c b/tests/i915/gem_ppgtt.c
index 4c9691e3..65ccc209 100644
--- a/tests/i915/gem_ppgtt.c
+++ b/tests/i915/gem_ppgtt.c
@@ -24,17 +24,10 @@
#include <stdbool.h>
#include <unistd.h>
#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
#include <sys/time.h>
-#include <drm.h>
-
#include "i915/gem.h"
#include "i915/gem_create.h"
#include "igt.h"
diff --git a/tests/i915/gem_pread.c b/tests/i915/gem_pread.c
index a8bf2b05..485a7f63 100644
--- a/tests/i915/gem_pread.c
+++ b/tests/i915/gem_pread.c
@@ -34,11 +34,9 @@
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
-#include <inttypes.h>
#include <errno.h>
#include <sys/ioctl.h>
#include <sys/resource.h>
-#include <sys/stat.h>
#include <sys/time.h>
#include <pthread.h>
diff --git a/tests/i915/gem_pread_after_blit.c b/tests/i915/gem_pread_after_blit.c
index 3b56f787..df64528c 100644
--- a/tests/i915/gem_pread_after_blit.c
+++ b/tests/i915/gem_pread_after_blit.c
@@ -34,16 +34,9 @@
* ranged-buffer-flush paths in the kernel.
*/
-#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-
-#include <drm.h>
#include "i915/gem.h"
#include "igt.h"
diff --git a/tests/i915/gem_pwrite.c b/tests/i915/gem_pwrite.c
index e8e8c7ad..6f8ccec5 100644
--- a/tests/i915/gem_pwrite.c
+++ b/tests/i915/gem_pwrite.c
@@ -34,11 +34,9 @@
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
-#include <inttypes.h>
#include <errno.h>
#include <sys/ioctl.h>
#include <sys/resource.h>
-#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
diff --git a/tests/i915/gem_pwrite_snooped.c b/tests/i915/gem_pwrite_snooped.c
index e6a10747..18446a61 100644
--- a/tests/i915/gem_pwrite_snooped.c
+++ b/tests/i915/gem_pwrite_snooped.c
@@ -25,16 +25,8 @@
#include <unistd.h>
#include <stdlib.h>
#include <stdint.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-
-#include "drm.h"
+
#include "i915/gem.h"
#include "igt.h"
diff --git a/tests/i915/gem_read_read_speed.c b/tests/i915/gem_read_read_speed.c
index 7c5c90f7..bf82678d 100644
--- a/tests/i915/gem_read_read_speed.c
+++ b/tests/i915/gem_read_read_speed.c
@@ -26,19 +26,12 @@
* This is a test of performance with multiple readers from the same source.
*/
-#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
#include <time.h>
-#include <sys/stat.h>
#include <sys/time.h>
#include <sys/wait.h>
-#include <drm.h>
-
#include "i915/gem.h"
#include "igt.h"
#include "igt_sysfs.h"
diff --git a/tests/i915/gem_readwrite.c b/tests/i915/gem_readwrite.c
index 2d437dec..5ebd6337 100644
--- a/tests/i915/gem_readwrite.c
+++ b/tests/i915/gem_readwrite.c
@@ -27,13 +27,9 @@
#include "igt.h"
#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
#include <sys/ioctl.h>
#include "drm.h"
diff --git a/tests/i915/gem_reg_read.c b/tests/i915/gem_reg_read.c
index 79facc1f..4841f260 100644
--- a/tests/i915/gem_reg_read.c
+++ b/tests/i915/gem_reg_read.c
@@ -26,7 +26,6 @@
*/
#include "igt.h"
-#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <sys/utsname.h>
diff --git a/tests/i915/gem_render_copy.c b/tests/i915/gem_render_copy.c
index 3da29ec4..c4e6e676 100644
--- a/tests/i915/gem_render_copy.c
+++ b/tests/i915/gem_render_copy.c
@@ -30,19 +30,10 @@
*/
#include <stdbool.h>
-#include <unistd.h>
#include <cairo.h>
#include <stdlib.h>
-#include <sys/ioctl.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-
-#include <drm.h>
#include "i915/gem.h"
#include "igt.h"
diff --git a/tests/i915/gem_render_copy_redux.c b/tests/i915/gem_render_copy_redux.c
index 525c14d1..51c961c6 100644
--- a/tests/i915/gem_render_copy_redux.c
+++ b/tests/i915/gem_render_copy_redux.c
@@ -34,17 +34,8 @@
#include <stdbool.h>
#include <unistd.h>
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-
-#include <drm.h>
#include "i915/gem.h"
#include "igt.h"
diff --git a/tests/i915/gem_render_linear_blits.c b/tests/i915/gem_render_linear_blits.c
index 8e646127..2334848e 100644
--- a/tests/i915/gem_render_linear_blits.c
+++ b/tests/i915/gem_render_linear_blits.c
@@ -33,19 +33,9 @@
* The goal is to simply ensure the basics work.
*/
-#include "config.h"
-
#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-
-#include <drm.h>
#include "i915/gem.h"
#include "igt.h"
diff --git a/tests/i915/gem_render_tiled_blits.c b/tests/i915/gem_render_tiled_blits.c
index 187714d6..5530e3d4 100644
--- a/tests/i915/gem_render_tiled_blits.c
+++ b/tests/i915/gem_render_tiled_blits.c
@@ -34,18 +34,9 @@
*/
#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
#include <sys/mman.h>
-#include <drm.h>
-
#include "i915/gem.h"
#include "igt.h"
diff --git a/tests/i915/gem_request_retire.c b/tests/i915/gem_request_retire.c
index da9d405e..dbb5d4f5 100644
--- a/tests/i915/gem_request_retire.c
+++ b/tests/i915/gem_request_retire.c
@@ -30,21 +30,8 @@
* Collection of tests targeting request retirement code paths.
*/
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/mman.h>
-#include <signal.h>
-#include <pthread.h>
-#include <time.h>
-
-#include "drm.h"
-#include "i915_drm.h"
#include "i915/gem.h"
#include "igt.h"
diff --git a/tests/i915/gem_reset_stats.c b/tests/i915/gem_reset_stats.c
index baa10151..ad772533 100644
--- a/tests/i915/gem_reset_stats.c
+++ b/tests/i915/gem_reset_stats.c
@@ -31,12 +31,8 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
#include <sys/ioctl.h>
-#include <sys/mman.h>
#include <time.h>
#include <signal.h>
#include <poll.h>
diff --git a/tests/i915/gem_ringfill.c b/tests/i915/gem_ringfill.c
index ecfa0bea..e1b07fc3 100644
--- a/tests/i915/gem_ringfill.c
+++ b/tests/i915/gem_ringfill.c
@@ -37,10 +37,8 @@
#include "igt.h"
#include "igt_device.h"
#include "igt_gt.h"
-#include "igt_vgem.h"
#include <signal.h>
-#include <sys/ioctl.h>
#define INTERRUPTIBLE 0x1
#define HANG 0x2
diff --git a/tests/i915/gem_set_tiling_vs_blt.c b/tests/i915/gem_set_tiling_vs_blt.c
index 5e3bf6a1..a624b4c7 100644
--- a/tests/i915/gem_set_tiling_vs_blt.c
+++ b/tests/i915/gem_set_tiling_vs_blt.c
@@ -44,17 +44,10 @@
* transitions (i.e. changing stride).
*/
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
#include <stdbool.h>
-#include "drm.h"
#include "i915/gem.h"
#include "igt.h"
diff --git a/tests/i915/gem_set_tiling_vs_gtt.c b/tests/i915/gem_set_tiling_vs_gtt.c
index 2f890e83..acf64fbd 100644
--- a/tests/i915/gem_set_tiling_vs_gtt.c
+++ b/tests/i915/gem_set_tiling_vs_gtt.c
@@ -27,16 +27,9 @@
#include "igt.h"
#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include "drm.h"
#include "i915/gem_create.h"
IGT_TEST_DESCRIPTION("Check set_tiling vs gtt mmap coherency.");
diff --git a/tests/i915/gem_set_tiling_vs_pwrite.c b/tests/i915/gem_set_tiling_vs_pwrite.c
index 6bec7f27..bd2e419b 100644
--- a/tests/i915/gem_set_tiling_vs_pwrite.c
+++ b/tests/i915/gem_set_tiling_vs_pwrite.c
@@ -27,16 +27,9 @@
#include "igt.h"
#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include "drm.h"
#include "i915/gem_create.h"
IGT_TEST_DESCRIPTION("Check set_tiling vs pwrite coherency.");
diff --git a/tests/i915/gem_streaming_writes.c b/tests/i915/gem_streaming_writes.c
index 883fe429..8dcce69b 100644
--- a/tests/i915/gem_streaming_writes.c
+++ b/tests/i915/gem_streaming_writes.c
@@ -29,14 +29,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <pthread.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-
-#include "drm.h"
+
#include "i915/gem.h"
#include "i915/gem_create.h"
#include "igt.h"
diff --git a/tests/i915/gem_stress.c b/tests/i915/gem_stress.c
index 3765ab14..1afab191 100644
--- a/tests/i915/gem_stress.c
+++ b/tests/i915/gem_stress.c
@@ -51,16 +51,8 @@
#include "igt.h"
#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-
-#include <drm.h>
IGT_TEST_DESCRIPTION("General gem coherency test.");
diff --git a/tests/i915/gem_sync.c b/tests/i915/gem_sync.c
index 8c435845..91744d96 100644
--- a/tests/i915/gem_sync.c
+++ b/tests/i915/gem_sync.c
@@ -31,7 +31,6 @@
#include "igt_dummyload.h"
#include "igt_gt.h"
#include "igt.h"
-#include "igt_sysfs.h"
#define MAX_PRIO I915_CONTEXT_MAX_USER_PRIORITY
#define MIN_PRIO I915_CONTEXT_MIN_USER_PRIORITY
diff --git a/tests/i915/gem_tiled_blits.c b/tests/i915/gem_tiled_blits.c
index c93d04d6..a8e64fcc 100644
--- a/tests/i915/gem_tiled_blits.c
+++ b/tests/i915/gem_tiled_blits.c
@@ -42,15 +42,8 @@
*/
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-
-#include <drm.h>
#include "i915/gem.h"
#include "igt.h"
diff --git a/tests/i915/gem_tiled_partial_pwrite_pread.c b/tests/i915/gem_tiled_partial_pwrite_pread.c
index 95fb69c6..cc5df371 100644
--- a/tests/i915/gem_tiled_partial_pwrite_pread.c
+++ b/tests/i915/gem_tiled_partial_pwrite_pread.c
@@ -26,13 +26,7 @@
*/
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
#include <drm.h>
diff --git a/tests/i915/gem_tiled_pread_basic.c b/tests/i915/gem_tiled_pread_basic.c
index 2b4cec6e..1809a101 100644
--- a/tests/i915/gem_tiled_pread_basic.c
+++ b/tests/i915/gem_tiled_pread_basic.c
@@ -37,16 +37,9 @@
#include "igt.h"
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/ioctl.h>
-#include "drm.h"
#include "i915/gem_create.h"
IGT_TEST_DESCRIPTION("Test pread behavior on tiled objects with respect to the"
diff --git a/tests/i915/gem_tiled_pread_pwrite.c b/tests/i915/gem_tiled_pread_pwrite.c
index f77cd3bd..1a15efb6 100644
--- a/tests/i915/gem_tiled_pread_pwrite.c
+++ b/tests/i915/gem_tiled_pread_pwrite.c
@@ -46,17 +46,9 @@
#include "igt.h"
#include "igt_x86.h"
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/ioctl.h>
-#include "drm.h"
#include "i915/gem_create.h"
IGT_TEST_DESCRIPTION("Test swizzling by testing pwrite does the inverse of"
diff --git a/tests/i915/gem_tiled_swapping.c b/tests/i915/gem_tiled_swapping.c
index d66b6ca7..8b9a3ab5 100644
--- a/tests/i915/gem_tiled_swapping.c
+++ b/tests/i915/gem_tiled_swapping.c
@@ -46,17 +46,10 @@
#include "igt.h"
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/ioctl.h>
#include <pthread.h>
-#include "drm.h"
#include "i915/gem_create.h"
IGT_TEST_DESCRIPTION("Exercise swizzle code for swapping.");
diff --git a/tests/i915/gem_tiled_wb.c b/tests/i915/gem_tiled_wb.c
index e9efbdf2..bfbc158d 100644
--- a/tests/i915/gem_tiled_wb.c
+++ b/tests/i915/gem_tiled_wb.c
@@ -34,14 +34,9 @@
#include "igt.h"
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/ioctl.h>
#include "drm.h"
#include "i915/gem_create.h"
diff --git a/tests/i915/gem_tiled_wc.c b/tests/i915/gem_tiled_wc.c
index 1f245eb7..c4fb7079 100644
--- a/tests/i915/gem_tiled_wc.c
+++ b/tests/i915/gem_tiled_wc.c
@@ -34,14 +34,10 @@
#include "igt.h"
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
#include <sys/time.h>
-#include <sys/ioctl.h>
#include "drm.h"
#include "i915/gem_create.h"
diff --git a/tests/i915/gem_tiling_max_stride.c b/tests/i915/gem_tiling_max_stride.c
index 513d579d..14810945 100644
--- a/tests/i915/gem_tiling_max_stride.c
+++ b/tests/i915/gem_tiling_max_stride.c
@@ -28,16 +28,11 @@
#include "igt.h"
#include <unistd.h>
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
#include <limits.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include "drm.h"
#include "i915/gem_create.h"
IGT_TEST_DESCRIPTION("Check that max fence stride works.");
diff --git a/tests/i915/gem_unfence_active_buffers.c b/tests/i915/gem_unfence_active_buffers.c
index 532eed2e..befb094d 100644
--- a/tests/i915/gem_unfence_active_buffers.c
+++ b/tests/i915/gem_unfence_active_buffers.c
@@ -38,17 +38,9 @@
* problem - the race window is too small.
*/
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <stdbool.h>
-#include "drm.h"
#include "i915/gem.h"
#include "i915/gem_create.h"
#include "igt.h"
diff --git a/tests/i915/gem_unref_active_buffers.c b/tests/i915/gem_unref_active_buffers.c
index 3b8c981d..3cd88469 100644
--- a/tests/i915/gem_unref_active_buffers.c
+++ b/tests/i915/gem_unref_active_buffers.c
@@ -33,7 +33,6 @@
*/
#include <errno.h>
#include <fcntl.h>
-#include <inttypes.h>
#include <sys/ioctl.h>
#include <sys/signal.h>
#include <sys/time.h>
diff --git a/tests/i915/gem_userptr_blits.c b/tests/i915/gem_userptr_blits.c
index ec3f2755..f75bf909 100644
--- a/tests/i915/gem_userptr_blits.c
+++ b/tests/i915/gem_userptr_blits.c
@@ -47,7 +47,6 @@
#include <setjmp.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
-#include <sys/stat.h>
#include <sys/syscall.h>
#include <sys/time.h>
#include <glib.h>
diff --git a/tests/i915/gem_vm_create.c b/tests/i915/gem_vm_create.c
index 3005d347..fa8ca9ee 100644
--- a/tests/i915/gem_vm_create.c
+++ b/tests/i915/gem_vm_create.c
@@ -25,7 +25,6 @@
#include "i915/gem_create.h"
#include "i915/gem_vm.h"
#include "igt.h"
-#include "igt_rand.h"
#include "igt_dummyload.h"
static int vm_create_ioctl(int i915, struct drm_i915_gem_vm_control *ctl)
diff --git a/tests/i915/gem_watchdog.c b/tests/i915/gem_watchdog.c
index fc1ba007..4baee01c 100644
--- a/tests/i915/gem_watchdog.c
+++ b/tests/i915/gem_watchdog.c
@@ -21,8 +21,6 @@
* IN THE SOFTWARE.
*/
-#include "config.h"
-
#include <fcntl.h>
#include <sys/ioctl.h>
#include <stdio.h>
--
2.36.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [igt-dev] [PATCH i-g-t 14/14] tests/i915/*: Remove unused headers
2022-05-31 14:28 [igt-dev] [PATCH i-g-t 01/14] lib: Remove unused headers Ryszard Knop
` (11 preceding siblings ...)
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 13/14] tests/i915/gem*: " Ryszard Knop
@ 2022-05-31 14:28 ` Ryszard Knop
12 siblings, 0 replies; 14+ messages in thread
From: Ryszard Knop @ 2022-05-31 14:28 UTC (permalink / raw)
To: Development mailing list for IGT GPU Tools
Using CLion's automated code inspection, most unused includes were found
and removed. Some warnings remain as CLion is unable to track code usage
across certain attributes, but the vast majority of unneeded headers are
now gone.
Signed-off-by: Ryszard Knop <ryszard.knop@intel.com>
---
tests/i915/api_intel_bb.c | 5 -----
tests/i915/drm_fdinfo.c | 1 -
tests/i915/gen3_mixed_blits.c | 7 -------
tests/i915/gen3_render_linear_blits.c | 6 ------
tests/i915/gen3_render_mixed_blits.c | 7 -------
tests/i915/gen3_render_tiledx_blits.c | 7 -------
tests/i915/gen3_render_tiledy_blits.c | 7 -------
tests/i915/gen7_exec_parse.c | 2 --
tests/i915/gen9_exec_parse.c | 1 -
tests/i915/i915_hangman.c | 3 ---
tests/i915/i915_module_load.c | 4 ----
tests/i915/i915_pm_backlight.c | 1 -
tests/i915/i915_pm_dc.c | 1 -
tests/i915/i915_pm_lpsp.c | 1 -
tests/i915/i915_pm_rpm.c | 4 ----
tests/i915/i915_pm_rps.c | 1 -
tests/i915/i915_pm_sseu.c | 1 -
tests/i915/i915_suspend.c | 6 ------
tests/i915/kms_dsc.c | 8 --------
tests/i915/kms_fbcon_fbt.c | 1 -
tests/i915/kms_fence_pin_leak.c | 3 ---
tests/i915/kms_frontbuffer_tracking.c | 1 -
tests/i915/kms_mmap_write_crc.c | 2 --
tests/i915/kms_psr.c | 1 -
tests/i915/kms_psr2_sf.c | 2 --
tests/i915/kms_psr2_su.c | 2 --
tests/i915/kms_psr_stress_test.c | 3 ---
tests/i915/kms_pwrite_crc.c | 4 ----
tests/i915/perf.c | 3 ---
tests/i915/perf_pmu.c | 6 ------
tests/i915/sysfs_clients.c | 4 ----
tests/i915/sysfs_defaults.c | 3 ---
tests/i915/sysfs_heartbeat_interval.c | 5 -----
tests/i915/sysfs_preempt_timeout.c | 3 ---
tests/i915/sysfs_timeslice_duration.c | 3 ---
35 files changed, 119 deletions(-)
diff --git a/tests/i915/api_intel_bb.c b/tests/i915/api_intel_bb.c
index 92f44cec..72f22159 100644
--- a/tests/i915/api_intel_bb.c
+++ b/tests/i915/api_intel_bb.c
@@ -22,18 +22,13 @@
*/
#include "igt.h"
-#include "i915/gem.h"
#include "i915/gem_create.h"
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
#include <cairo.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <glib.h>
#include <zlib.h>
#include "intel_bufops.h"
diff --git a/tests/i915/drm_fdinfo.c b/tests/i915/drm_fdinfo.c
index 3475d35b..608c0b93 100644
--- a/tests/i915/drm_fdinfo.c
+++ b/tests/i915/drm_fdinfo.c
@@ -24,7 +24,6 @@
#include "igt.h"
#include "igt_core.h"
-#include "igt_device.h"
#include "igt_drm_fdinfo.h"
#include "i915/gem.h"
#include "intel_ctx.h"
diff --git a/tests/i915/gen3_mixed_blits.c b/tests/i915/gen3_mixed_blits.c
index 184effec..d31db701 100644
--- a/tests/i915/gen3_mixed_blits.c
+++ b/tests/i915/gen3_mixed_blits.c
@@ -34,16 +34,9 @@
*/
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/ioctl.h>
-#include "drm.h"
#include "i915/gem.h"
#include "i915/gem_create.h"
#include "i915_reg.h"
diff --git a/tests/i915/gen3_render_linear_blits.c b/tests/i915/gen3_render_linear_blits.c
index f01df69e..5db287e5 100644
--- a/tests/i915/gen3_render_linear_blits.c
+++ b/tests/i915/gen3_render_linear_blits.c
@@ -34,15 +34,9 @@
*/
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include "drm.h"
#include "i915/gem.h"
#include "i915/gem_create.h"
#include "i915_reg.h"
diff --git a/tests/i915/gen3_render_mixed_blits.c b/tests/i915/gen3_render_mixed_blits.c
index 9ebb93be..79911003 100644
--- a/tests/i915/gen3_render_mixed_blits.c
+++ b/tests/i915/gen3_render_mixed_blits.c
@@ -34,16 +34,9 @@
*/
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/ioctl.h>
-#include "drm.h"
#include "i915/gem.h"
#include "i915/gem_create.h"
#include "i915_reg.h"
diff --git a/tests/i915/gen3_render_tiledx_blits.c b/tests/i915/gen3_render_tiledx_blits.c
index b8aa0edc..520c87ea 100644
--- a/tests/i915/gen3_render_tiledx_blits.c
+++ b/tests/i915/gen3_render_tiledx_blits.c
@@ -34,16 +34,9 @@
*/
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/ioctl.h>
-#include "drm.h"
#include "i915/gem.h"
#include "i915/gem_create.h"
#include "i915_reg.h"
diff --git a/tests/i915/gen3_render_tiledy_blits.c b/tests/i915/gen3_render_tiledy_blits.c
index 2d1b2d8e..b9e81616 100644
--- a/tests/i915/gen3_render_tiledy_blits.c
+++ b/tests/i915/gen3_render_tiledy_blits.c
@@ -34,15 +34,8 @@
*/
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/ioctl.h>
-#include "drm.h"
#include "i915/gem.h"
#include "i915/gem_create.h"
diff --git a/tests/i915/gen7_exec_parse.c b/tests/i915/gen7_exec_parse.c
index 67324061..cd7cf2b7 100644
--- a/tests/i915/gen7_exec_parse.c
+++ b/tests/i915/gen7_exec_parse.c
@@ -27,8 +27,6 @@
#include <stdio.h>
#include <errno.h>
-#include <drm.h>
-
#include "igt.h"
#include "igt_device.h"
#include "i915/gem.h"
diff --git a/tests/i915/gen9_exec_parse.c b/tests/i915/gen9_exec_parse.c
index b35f2cb4..3d7d9f1a 100644
--- a/tests/i915/gen9_exec_parse.c
+++ b/tests/i915/gen9_exec_parse.c
@@ -26,7 +26,6 @@
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
-#include <stdlib.h>
#include "i915/gem.h"
#include "i915/gem_create.h"
diff --git a/tests/i915/i915_hangman.c b/tests/i915/i915_hangman.c
index c7d69fdd..7d55a1e0 100644
--- a/tests/i915/i915_hangman.c
+++ b/tests/i915/i915_hangman.c
@@ -26,10 +26,7 @@
*
*/
-#include <limits.h>
#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
#include <fcntl.h>
#include <signal.h>
diff --git a/tests/i915/i915_module_load.c b/tests/i915/i915_module_load.c
index f5f98acc..2801a4e0 100644
--- a/tests/i915/i915_module_load.c
+++ b/tests/i915/i915_module_load.c
@@ -22,10 +22,6 @@
*/
#include "igt.h"
#include <dirent.h>
-#include <sys/utsname.h>
-#include <linux/limits.h>
-#include <signal.h>
-#include <libgen.h>
#include <signal.h>
#include <sys/ioctl.h>
#include <fcntl.h>
diff --git a/tests/i915/i915_pm_backlight.c b/tests/i915/i915_pm_backlight.c
index cafae7f7..c30e924d 100644
--- a/tests/i915/i915_pm_backlight.c
+++ b/tests/i915/i915_pm_backlight.c
@@ -27,7 +27,6 @@
#include "igt.h"
#include <limits.h>
-#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <stdio.h>
diff --git a/tests/i915/i915_pm_dc.c b/tests/i915/i915_pm_dc.c
index 2c2c5086..cd83de12 100644
--- a/tests/i915/i915_pm_dc.c
+++ b/tests/i915/i915_pm_dc.c
@@ -25,7 +25,6 @@
#include <errno.h>
#include <fcntl.h>
#include <stdbool.h>
-#include <stdio.h>
#include <string.h>
#include "igt.h"
#include "igt_kmod.h"
diff --git a/tests/i915/i915_pm_lpsp.c b/tests/i915/i915_pm_lpsp.c
index 3ad8b260..fc85c9f7 100644
--- a/tests/i915/i915_pm_lpsp.c
+++ b/tests/i915/i915_pm_lpsp.c
@@ -28,7 +28,6 @@
#include "igt_kmod.h"
#include "igt_pm.h"
#include "igt_sysfs.h"
-#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
diff --git a/tests/i915/i915_pm_rpm.c b/tests/i915/i915_pm_rpm.c
index bf145b6c..390f0901 100644
--- a/tests/i915/i915_pm_rpm.c
+++ b/tests/i915/i915_pm_rpm.c
@@ -25,8 +25,6 @@
*
*/
-#include "config.h"
-
#include <stdio.h>
#include <stdint.h>
#include <stdbool.h>
@@ -38,8 +36,6 @@
#include <dirent.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
#include <linux/i2c.h>
#include <linux/i2c-dev.h>
diff --git a/tests/i915/i915_pm_rps.c b/tests/i915/i915_pm_rps.c
index b37f15c2..7764c72e 100644
--- a/tests/i915/i915_pm_rps.c
+++ b/tests/i915/i915_pm_rps.c
@@ -34,7 +34,6 @@
#include <signal.h>
#include <errno.h>
#include <time.h>
-#include <sys/wait.h>
#include "i915/gem.h"
#include "igt.h"
diff --git a/tests/i915/i915_pm_sseu.c b/tests/i915/i915_pm_sseu.c
index 1b428c9b..2e2101e4 100644
--- a/tests/i915/i915_pm_sseu.c
+++ b/tests/i915/i915_pm_sseu.c
@@ -27,7 +27,6 @@
#include <fcntl.h>
#include <unistd.h>
#include <string.h>
-#include <errno.h>
#include <time.h>
#include "i915_drm.h"
diff --git a/tests/i915/i915_suspend.c b/tests/i915/i915_suspend.c
index 1c464f7a..c9e51950 100644
--- a/tests/i915/i915_suspend.c
+++ b/tests/i915/i915_suspend.c
@@ -30,13 +30,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <fcntl.h>
#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-
-#include <drm.h>
#include "i915/gem.h"
#include "i915/gem_create.h"
diff --git a/tests/i915/kms_dsc.c b/tests/i915/kms_dsc.c
index c94c64c4..76ddac84 100644
--- a/tests/i915/kms_dsc.c
+++ b/tests/i915/kms_dsc.c
@@ -30,19 +30,11 @@
*
*/
#include "igt.h"
-#include "igt_sysfs.h"
-#include <errno.h>
-#include <getopt.h>
-#include <math.h>
#include <stdint.h>
#include <stdbool.h>
#include <strings.h>
#include <unistd.h>
#include <stdlib.h>
-#include <signal.h>
-#include <time.h>
-#include <fcntl.h>
-#include <termios.h>
IGT_TEST_DESCRIPTION("Test to validate display stream compression");
diff --git a/tests/i915/kms_fbcon_fbt.c b/tests/i915/kms_fbcon_fbt.c
index 98c452c4..ab59883d 100644
--- a/tests/i915/kms_fbcon_fbt.c
+++ b/tests/i915/kms_fbcon_fbt.c
@@ -28,7 +28,6 @@
#include "igt_device.h"
#include "igt_psr.h"
#include "igt_sysfs.h"
-#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/tests/i915/kms_fence_pin_leak.c b/tests/i915/kms_fence_pin_leak.c
index 16eb595f..500258b1 100644
--- a/tests/i915/kms_fence_pin_leak.c
+++ b/tests/i915/kms_fence_pin_leak.c
@@ -22,10 +22,7 @@
*
*/
-#include <errno.h>
-#include <limits.h>
#include <stdbool.h>
-#include <stdio.h>
#include <string.h>
#include "i915/gem.h"
diff --git a/tests/i915/kms_frontbuffer_tracking.c b/tests/i915/kms_frontbuffer_tracking.c
index 814ddb46..73a3324e 100644
--- a/tests/i915/kms_frontbuffer_tracking.c
+++ b/tests/i915/kms_frontbuffer_tracking.c
@@ -25,7 +25,6 @@
*/
#include <sys/types.h>
-#include <sys/stat.h>
#include <fcntl.h>
#include <poll.h>
#include <pthread.h>
diff --git a/tests/i915/kms_mmap_write_crc.c b/tests/i915/kms_mmap_write_crc.c
index b17e5fdb..75d3cd90 100644
--- a/tests/i915/kms_mmap_write_crc.c
+++ b/tests/i915/kms_mmap_write_crc.c
@@ -25,9 +25,7 @@
*/
#include <errno.h>
-#include <limits.h>
#include <stdbool.h>
-#include <stdio.h>
#include <string.h>
#include "drmtest.h"
diff --git a/tests/i915/kms_psr.c b/tests/i915/kms_psr.c
index 480e2cc7..4b52c0ee 100644
--- a/tests/i915/kms_psr.c
+++ b/tests/i915/kms_psr.c
@@ -23,7 +23,6 @@
*/
#include "igt.h"
-#include "igt_sysfs.h"
#include "igt_psr.h"
#include <errno.h>
#include <stdbool.h>
diff --git a/tests/i915/kms_psr2_sf.c b/tests/i915/kms_psr2_sf.c
index 1ccbd11a..dce758c7 100644
--- a/tests/i915/kms_psr2_sf.c
+++ b/tests/i915/kms_psr2_sf.c
@@ -23,9 +23,7 @@
*/
#include "igt.h"
-#include "igt_sysfs.h"
#include "igt_psr.h"
-#include <errno.h>
#include <stdbool.h>
#include <stdio.h>
#include <string.h>
diff --git a/tests/i915/kms_psr2_su.c b/tests/i915/kms_psr2_su.c
index caccf713..41180374 100644
--- a/tests/i915/kms_psr2_su.c
+++ b/tests/i915/kms_psr2_su.c
@@ -23,9 +23,7 @@
*/
#include "igt.h"
-#include "igt_sysfs.h"
#include "igt_psr.h"
-#include <errno.h>
#include <stdbool.h>
#include <stdio.h>
#include <string.h>
diff --git a/tests/i915/kms_psr_stress_test.c b/tests/i915/kms_psr_stress_test.c
index daac41d4..444ae074 100644
--- a/tests/i915/kms_psr_stress_test.c
+++ b/tests/i915/kms_psr_stress_test.c
@@ -1,10 +1,7 @@
#include "igt.h"
-#include "igt_sysfs.h"
#include "igt_psr.h"
-#include <errno.h>
#include <poll.h>
#include <stdbool.h>
-#include <stdio.h>
#include <string.h>
#include <sys/timerfd.h>
diff --git a/tests/i915/kms_pwrite_crc.c b/tests/i915/kms_pwrite_crc.c
index 584e6a19..7455b427 100644
--- a/tests/i915/kms_pwrite_crc.c
+++ b/tests/i915/kms_pwrite_crc.c
@@ -23,10 +23,6 @@
*/
#include "igt.h"
-#include <errno.h>
-#include <limits.h>
-#include <stdbool.h>
-#include <stdio.h>
#include <string.h>
diff --git a/tests/i915/perf.c b/tests/i915/perf.c
index e641d5d2..0b0a752a 100644
--- a/tests/i915/perf.c
+++ b/tests/i915/perf.c
@@ -30,13 +30,10 @@
#include <errno.h>
#include <signal.h>
#include <sys/stat.h>
-#include <sys/time.h>
#include <sys/times.h>
#include <sys/types.h>
-#include <dirent.h>
#include <time.h>
#include <poll.h>
-#include <math.h>
#include "i915/gem.h"
#include "i915/perf.h"
diff --git a/tests/i915/perf_pmu.c b/tests/i915/perf_pmu.c
index 1e385beb..11dbdb2f 100644
--- a/tests/i915/perf_pmu.c
+++ b/tests/i915/perf_pmu.c
@@ -29,14 +29,8 @@
#include <inttypes.h>
#include <errno.h>
#include <signal.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/times.h>
-#include <sys/types.h>
-#include <dirent.h>
#include <time.h>
#include <poll.h>
-#include <sched.h>
#include "i915/gem.h"
#include "i915/gem_create.h"
diff --git a/tests/i915/sysfs_clients.c b/tests/i915/sysfs_clients.c
index ab79ff18..b1d41d89 100644
--- a/tests/i915/sysfs_clients.c
+++ b/tests/i915/sysfs_clients.c
@@ -5,15 +5,11 @@
#include <ctype.h>
#include <dirent.h>
-#include <errno.h>
#include <fcntl.h>
#include <inttypes.h>
-#include <limits.h>
#include <math.h>
#include <sched.h>
#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/types.h>
#include <unistd.h>
#include "drmtest.h"
diff --git a/tests/i915/sysfs_defaults.c b/tests/i915/sysfs_defaults.c
index dda27a0a..6ab73491 100644
--- a/tests/i915/sysfs_defaults.c
+++ b/tests/i915/sysfs_defaults.c
@@ -22,11 +22,8 @@
*/
#include <dirent.h>
-#include <errno.h>
#include <fcntl.h>
-#include <inttypes.h>
#include <sys/stat.h>
-#include <sys/types.h>
#include <unistd.h>
#include "drmtest.h"
diff --git a/tests/i915/sysfs_heartbeat_interval.c b/tests/i915/sysfs_heartbeat_interval.c
index bc8d1b3c..db72bbd2 100644
--- a/tests/i915/sysfs_heartbeat_interval.c
+++ b/tests/i915/sysfs_heartbeat_interval.c
@@ -24,11 +24,7 @@
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
-#include <inttypes.h>
#include <signal.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/wait.h>
#include <unistd.h>
#include "igt_params.h"
@@ -37,7 +33,6 @@
#include "i915/gem_context.h"
#include "i915/gem_engine_topology.h"
#include "intel_allocator.h"
-#include "igt_debugfs.h"
#include "igt_dummyload.h"
#include "igt_sysfs.h"
#include "sw_sync.h"
diff --git a/tests/i915/sysfs_preempt_timeout.c b/tests/i915/sysfs_preempt_timeout.c
index 51503828..572a0e75 100644
--- a/tests/i915/sysfs_preempt_timeout.c
+++ b/tests/i915/sysfs_preempt_timeout.c
@@ -24,9 +24,7 @@
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
-#include <inttypes.h>
#include <sched.h>
-#include <sys/types.h>
#include <unistd.h>
#include "igt.h"
@@ -35,7 +33,6 @@
#include "i915/gem.h"
#include "i915/gem_context.h"
#include "i915/gem_engine_topology.h"
-#include "igt_debugfs.h"
#include "igt_dummyload.h"
#include "igt_sysfs.h"
#include "intel_allocator.h"
diff --git a/tests/i915/sysfs_timeslice_duration.c b/tests/i915/sysfs_timeslice_duration.c
index 8a2f1c2f..ef5d7f3d 100644
--- a/tests/i915/sysfs_timeslice_duration.c
+++ b/tests/i915/sysfs_timeslice_duration.c
@@ -24,9 +24,6 @@
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
-#include <inttypes.h>
-#include <sys/stat.h>
-#include <sys/types.h>
#include <unistd.h>
#include "igt_params.h"
--
2.36.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
end of thread, other threads:[~2022-05-31 14:29 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-31 14:28 [igt-dev] [PATCH i-g-t 01/14] lib: Remove unused headers Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 02/14] assembler: " Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 03/14] benchmarks: " Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 04/14] overlay: " Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 05/14] runner: " Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 06/14] tests/amdgpu: " Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 07/14] tests/vc4*: " Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 08/14] tests/v3d*: " Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 09/14] tests/panfrost*: " Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 10/14] tests/kms*: " Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 11/14] tests/*: " Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 12/14] tools: " Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 13/14] tests/i915/gem*: " Ryszard Knop
2022-05-31 14:28 ` [igt-dev] [PATCH i-g-t 14/14] tests/i915/*: " Ryszard Knop
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.