[Intel-gfx] [PATCH i-g-t] tests: Move perf/perf_pmu under i915

Chris Wilson chris at chris-wilson.co.uk
Thu Jun 18 09:50:14 UTC 2020


These are i915 specific tests of the perf and perf-workalike interfaces,
so move them under i915/

Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
---
 tests/Makefile.sources      | 8 ++++++--
 tests/{ => i915}/perf.c     | 0
 tests/{ => i915}/perf_pmu.c | 0
 tests/meson.build           | 6 ++++--
 4 files changed, 10 insertions(+), 4 deletions(-)
 rename tests/{ => i915}/perf.c (100%)
 rename tests/{ => i915}/perf_pmu.c (100%)

diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index eaa6c0d04..af900bcfc 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -88,8 +88,6 @@ TESTS_progs = \
 	kms_vblank \
 	kms_vrr \
 	meta_test \
-	perf \
-	perf_pmu \
 	prime_busy \
 	prime_mmap \
 	prime_mmap_coherency \
@@ -115,6 +113,12 @@ sysfs_preempt_timeout_SOURCES = i915/sysfs_preempt_timeout.c
 TESTS_progs += sysfs_timeslice_duration
 sysfs_timeslice_duration_SOURCES = i915/sysfs_timeslice_duration.c
 
+TESTS_progs += perf
+perf_SOURCES = i915/perf.c
+
+TESTS_progs += perf_pmu
+perf_pmu_SOURCES = i915/perf_pmu.c
+
 TESTS_progs += gem_bad_reloc
 gem_bad_reloc_SOURCES = i915/gem_bad_reloc.c
 
diff --git a/tests/perf.c b/tests/i915/perf.c
similarity index 100%
rename from tests/perf.c
rename to tests/i915/perf.c
diff --git a/tests/perf_pmu.c b/tests/i915/perf_pmu.c
similarity index 100%
rename from tests/perf_pmu.c
rename to tests/i915/perf_pmu.c
diff --git a/tests/meson.build b/tests/meson.build
index e69bdb7d0..28091794f 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -336,14 +336,16 @@ test_executables += executable('i915_pm_rc6_residency',
 	   install : true)
 test_list += 'i915_pm_rc6_residency'
 
-test_executables += executable('perf_pmu', 'perf_pmu.c',
+test_executables += executable('perf_pmu',
+	   join_paths('i915', 'perf_pmu.c'),
 	   dependencies : test_deps + [ lib_igt_perf ],
 	   install_dir : libexecdir,
 	   install_rpath : libexecdir_rpathdir,
 	   install : true)
 test_list += 'perf_pmu'
 
-test_executables += executable('perf', 'perf.c',
+test_executables += executable('perf',
+	   join_paths('i915', 'perf.c'),
 	   dependencies : test_deps + [ lib_igt_i915_perf ],
 	   install_dir : libexecdir,
 	   install_rpath : libexecdir_rpathdir,
-- 
2.27.0



More information about the Intel-gfx mailing list