diff options
author | Katarzyna Dec <katarzyna.dec@intel.com> | 2017-09-07 14:15:14 +0200 |
---|---|---|
committer | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2017-09-12 14:42:49 +0300 |
commit | 1c6e20deb30e4fc059183f1cf3f832b500b89464 (patch) | |
tree | 72bb9cc0eb5f73849f7f33843127812071c8bf44 /tests | |
parent | f9e0154630766b63617c64255a68e5129e233a4b (diff) |
pm_rps: [RFC] RPS tests documentation update
Added comments in tricky places for better feature understanding.
Added IGT_TEST_DESCRIPTION and short description for non-obvious
subtests.
Changed name of 'magic' checkit() function to something meaningfull.
Changed junk struct and stuff array names.
Made some minor coding style changes.
Cc: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
Cc: Petri Latvala <petri.latvala@intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Petri Latvala <petri.latvala@intel.com>
Acked-by: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
Acked-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Acked-by: Radoslaw Szwichtenberg <radoslaw.szwichtenberg@intel.com>
Signed-off: Katarzyna Dec <katarzyna.dec@intel.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/pm_rps.c | 108 |
1 files changed, 64 insertions, 44 deletions
diff --git a/tests/pm_rps.c b/tests/pm_rps.c index 68c6bfe7..89f3e31c 100644 --- a/tests/pm_rps.c +++ b/tests/pm_rps.c @@ -39,6 +39,8 @@ #include "intel_bufmgr.h" +IGT_TEST_DESCRIPTION("Render P-States tests - verify GPU frequency changes"); + static int drm_fd; static const char sysfs_base_path[] = "/sys/class/drm/card%d/gt_%s_freq_mhz"; @@ -55,12 +57,19 @@ enum { static int origfreqs[NUMFREQ]; -struct junk { +struct sysfs_file { const char *name; const char *mode; FILE *filp; -} stuff[] = { - { "cur", "r", NULL }, { "min", "rb+", NULL }, { "max", "rb+", NULL }, { "RP0", "r", NULL }, { "RP1", "r", NULL }, { "RPn", "r", NULL }, { "boost", "rb+", NULL }, { NULL, NULL, NULL } +} sysfs_files[] = { + { "cur", "r", NULL }, + { "min", "rb+", NULL }, + { "max", "rb+", NULL }, + { "RP0", "r", NULL }, + { "RP1", "r", NULL }, + { "RPn", "r", NULL }, + { "boost", "rb+", NULL }, + { NULL, NULL, NULL } }; static int readval(FILE *filp) @@ -80,7 +89,7 @@ static void read_freqs(int *freqs) int i; for (i = 0; i < NUMFREQ; i++) - freqs[i] = readval(stuff[i].filp); + freqs[i] = readval(sysfs_files[i].filp); } static void nsleep(unsigned long ns) @@ -142,7 +151,7 @@ static int do_writeval(FILE *filp, int val, int lerrno, bool readback_check) #define writeval_inval(filp, val) do_writeval(filp, val, EINVAL, true) #define writeval_nocheck(filp, val) do_writeval(filp, val, 0, false) -static void checkit(const int *freqs) +static void check_freq_constraints(const int *freqs) { igt_assert_lte(freqs[MIN], freqs[MAX]); igt_assert_lte(freqs[CUR], freqs[MAX]); @@ -161,7 +170,7 @@ static void dump(const int *freqs) igt_debug("gt freq (MHz):"); for (i = 0; i < NUMFREQ; i++) - igt_debug(" %s=%d", stuff[i].name, freqs[i]); + igt_debug(" %s=%d", sysfs_files[i].name, freqs[i]); igt_debug("\n"); } @@ -386,14 +395,18 @@ static int get_hw_rounded_freq(int target) idx = MAX; old_freq = freqs[idx]; - writeval_nocheck(stuff[idx].filp, target); + writeval_nocheck(sysfs_files[idx].filp, target); read_freqs(freqs); ret = freqs[idx]; - writeval_nocheck(stuff[idx].filp, old_freq); + writeval_nocheck(sysfs_files[idx].filp, old_freq); return ret; } +/* + * Modify softlimit MIN and MAX freqs to valid and invalid levels. Depending + * on subtest run different check after each modification. + */ static void min_max_config(void (*check)(void), bool load_gpu) { int fmid = (origfreqs[RPn] + origfreqs[RP0]) / 2; @@ -410,78 +423,78 @@ static void min_max_config(void (*check)(void), bool load_gpu) check(); igt_debug("\nSet min=RPn and max=RP0...\n"); - writeval(stuff[MIN].filp, origfreqs[RPn]); - writeval(stuff[MAX].filp, origfreqs[RP0]); + writeval(sysfs_files[MIN].filp, origfreqs[RPn]); + writeval(sysfs_files[MAX].filp, origfreqs[RP0]); if (load_gpu) do_load_gpu(); check(); igt_debug("\nIncrease min to midpoint...\n"); - writeval(stuff[MIN].filp, fmid); + writeval(sysfs_files[MIN].filp, fmid); if (load_gpu) do_load_gpu(); check(); igt_debug("\nIncrease min to RP0...\n"); - writeval(stuff[MIN].filp, origfreqs[RP0]); + writeval(sysfs_files[MIN].filp, origfreqs[RP0]); if (load_gpu) do_load_gpu(); check(); igt_debug("\nIncrease min above RP0 (invalid)...\n"); - writeval_inval(stuff[MIN].filp, origfreqs[RP0] + 1000); + writeval_inval(sysfs_files[MIN].filp, origfreqs[RP0] + 1000); check(); igt_debug("\nDecrease max to RPn (invalid)...\n"); - writeval_inval(stuff[MAX].filp, origfreqs[RPn]); + writeval_inval(sysfs_files[MAX].filp, origfreqs[RPn]); check(); igt_debug("\nDecrease min to midpoint...\n"); - writeval(stuff[MIN].filp, fmid); + writeval(sysfs_files[MIN].filp, fmid); if (load_gpu) do_load_gpu(); check(); igt_debug("\nDecrease min to RPn...\n"); - writeval(stuff[MIN].filp, origfreqs[RPn]); + writeval(sysfs_files[MIN].filp, origfreqs[RPn]); if (load_gpu) do_load_gpu(); check(); igt_debug("\nDecrease min below RPn (invalid)...\n"); - writeval_inval(stuff[MIN].filp, 0); + writeval_inval(sysfs_files[MIN].filp, 0); check(); igt_debug("\nDecrease max to midpoint...\n"); - writeval(stuff[MAX].filp, fmid); + writeval(sysfs_files[MAX].filp, fmid); check(); igt_debug("\nDecrease max to RPn...\n"); - writeval(stuff[MAX].filp, origfreqs[RPn]); + writeval(sysfs_files[MAX].filp, origfreqs[RPn]); check(); igt_debug("\nDecrease max below RPn (invalid)...\n"); - writeval_inval(stuff[MAX].filp, 0); + writeval_inval(sysfs_files[MAX].filp, 0); check(); igt_debug("\nIncrease min to RP0 (invalid)...\n"); - writeval_inval(stuff[MIN].filp, origfreqs[RP0]); + writeval_inval(sysfs_files[MIN].filp, origfreqs[RP0]); check(); igt_debug("\nIncrease max to midpoint...\n"); - writeval(stuff[MAX].filp, fmid); + writeval(sysfs_files[MAX].filp, fmid); check(); igt_debug("\nIncrease max to RP0...\n"); - writeval(stuff[MAX].filp, origfreqs[RP0]); + writeval(sysfs_files[MAX].filp, origfreqs[RP0]); check(); igt_debug("\nIncrease max above RP0 (invalid)...\n"); - writeval_inval(stuff[MAX].filp, origfreqs[RP0] + 1000); + writeval_inval(sysfs_files[MAX].filp, origfreqs[RP0] + 1000); check(); - writeval(stuff[MIN].filp, origfreqs[MIN]); - writeval(stuff[MAX].filp, origfreqs[MAX]); + writeval(sysfs_files[MIN].filp, origfreqs[MIN]); + writeval(sysfs_files[MAX].filp, origfreqs[MAX]); } static void basic_check(void) @@ -490,7 +503,7 @@ static void basic_check(void) read_freqs(freqs); dump(freqs); - checkit(freqs); + check_freq_constraints(freqs); } #define IDLE_WAIT_TIMESTEP_MSEC 250 @@ -505,7 +518,7 @@ static void idle_check(void) do { read_freqs(freqs); dump(freqs); - checkit(freqs); + check_freq_constraints(freqs); if (freqs[CUR] == freqs[RPn]) break; usleep(1000 * IDLE_WAIT_TIMESTEP_MSEC); @@ -528,7 +541,7 @@ static void loaded_check(void) do { read_freqs(freqs); dump(freqs); - checkit(freqs); + check_freq_constraints(freqs); if (freqs[CUR] >= freqs[MAX]) break; usleep(1000 * LOADED_WAIT_TIMESTEP_MSEC); @@ -546,6 +559,8 @@ static void stabilize_check(int *out) int freqs[NUMFREQ]; int wait = 0; + /* Monitor frequencies until HW will stabilize cur frequency. + * It should happen within allotted time */ read_freqs(freqs); dump(freqs); usleep(1000 * STABILIZE_WAIT_TIMESTEP_MSEC); @@ -572,7 +587,7 @@ static void boost_freq(int fd, int *boost_freqs) fmid = get_hw_rounded_freq(fmid); /* Set max freq to less then boost freq */ - writeval(stuff[MAX].filp, fmid); + writeval(sysfs_files[MAX].filp, fmid); /* Put boost on the same engine as low load */ engine = I915_EXEC_RENDER; @@ -591,7 +606,7 @@ static void boost_freq(int fd, int *boost_freqs) igt_spin_batch_free(fd, load); /* Set max freq to original softmax */ - writeval(stuff[MAX].filp, origfreqs[MAX]); + writeval(sysfs_files[MAX].filp, origfreqs[MAX]); } static void waitboost(int fd, bool reset) @@ -633,12 +648,12 @@ static void waitboost(int fd, bool reset) static void pm_rps_exit_handler(int sig) { - if (origfreqs[MIN] > readval(stuff[MAX].filp)) { - writeval(stuff[MAX].filp, origfreqs[MAX]); - writeval(stuff[MIN].filp, origfreqs[MIN]); + if (origfreqs[MIN] > readval(sysfs_files[MAX].filp)) { + writeval(sysfs_files[MAX].filp, origfreqs[MAX]); + writeval(sysfs_files[MIN].filp, origfreqs[MIN]); } else { - writeval(stuff[MIN].filp, origfreqs[MIN]); - writeval(stuff[MAX].filp, origfreqs[MAX]); + writeval(sysfs_files[MIN].filp, origfreqs[MIN]); + writeval(sysfs_files[MAX].filp, origfreqs[MAX]); } load_helper_deinit(); @@ -651,7 +666,7 @@ igt_main igt_fixture { const int device = drm_get_card(); - struct junk *junk = stuff; + struct sysfs_file *sysfs_file = sysfs_files; int ret; /* Use drm_open_driver to verify device existence */ @@ -662,16 +677,17 @@ igt_main do { int val = -1; char *path; - ret = asprintf(&path, sysfs_base_path, device, junk->name); + + ret = asprintf(&path, sysfs_base_path, device, sysfs_file->name); igt_assert(ret != -1); - junk->filp = fopen(path, junk->mode); - igt_require(junk->filp); - setbuf(junk->filp, NULL); + sysfs_file->filp = fopen(path, sysfs_file->mode); + igt_require(sysfs_file->filp); + setbuf(sysfs_file->filp, NULL); - val = readval(junk->filp); + val = readval(sysfs_file->filp); igt_assert(val >= 0); - junk++; - } while (junk->name != NULL); + sysfs_file++; + } while (sysfs_file->name != NULL); read_freqs(origfreqs); @@ -683,18 +699,22 @@ igt_main igt_subtest("basic-api") min_max_config(basic_check, false); + /* Verify the constraints, check if we can reach idle */ igt_subtest("min-max-config-idle") min_max_config(idle_check, true); + /* Verify the constraints with high load, check if we can reach max */ igt_subtest("min-max-config-loaded") { load_helper_run(HIGH); min_max_config(loaded_check, false); load_helper_stop(); } + /* Checks if we achieve boost using gem_wait */ igt_subtest("waitboost") waitboost(drm_fd, false); + /* Test boost frequency after GPU reset */ igt_subtest("reset") { igt_hang_t hang = igt_allow_hang(drm_fd, 0, 0); waitboost(drm_fd, true); |