flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-14 03:16:21 +00:00
Code Issues Releases Wiki Activity

Fixed the review issues for pm_rc6_residency IGT case

Browse Source 
Why need add rc6_residency_counter subtest case:
RC6 feature support residency counter,from power consumption aspect,
the counter closer to 1,the better.If the counter is < 0.9, the residency
is not good and will impact power consumption value, if the counter is  > 1,
sysfs file is inaccurate.

Attach the test result message:
root@x-bdw05:/GFX/Test/Intel_gpu_tools/intel-gpu-tools/tests# ./pm_rc6_residency
IGT-Version: 1.6-g9a70e29 (x86_64) (Linux: 3.15.0-rc7_drm-intel-nightly_0a37b5_20140604+ x86_64)
Subtest rc6-residency-check: SUCCESS
This machine doesn't support rc6pp
This machine doesn't support rc6p
The residency counter : 0.987000
This machine entry rc6 state.
Subtest rc6-residency-counter: SUCCESS

root@x-bdw05:/GFX/Test/Intel_gpu_tools/intel-gpu-tools/tests# ./pm_rc6_residency --run-subtest rc6-residency-counter
IGT-Version: 1.6-g9a70e29 (x86_64) (Linux: 3.15.0-rc7_drm-intel-nightly_0a37b5_20140604+ x86_64)
This machine doesn't support rc6pp
This machine doesn't support rc6p
The residency counter : 0.987000
This machine entry rc6 state.
Subtest rc6-residency-counter: SUCCESS

root@x-bdw05:/GFX/Test/Intel_gpu_tools/intel-gpu-tools/tests# ./pm_rc6_residency --run-subtest rc6-residency-check
IGT-Version: 1.6-g9a70e29 (x86_64) (Linux: 3.15.0-rc7_drm-intel-nightly_0a37b5_20140604+ x86_64)
Subtest rc6-residency-check: SUCCESS

root@x-bdw05:/GFX/Test/Intel_gpu_tools/intel-gpu-tools/tests# ./pm_rc6_residency --list
rc6-residency-check
rc6-residency-counter

Run as non-root
[haha@x-pk home]$ ./pm_rc6_residency
IGT-Version: 1.6-g18d2130 (x86_64) (Linux: 3.13.0-rc3_drm-intel-nightly_639e4d_20131210+ x86_64)
No intel gpu found
Subtest rc6-residency-check: SKIP
Subtest rc6-residency-counter: SKIP

Run on non-intel platform
[root@x-pk5 home]# ./pm_rc6_residency
IGT-Version: 1.6-g18d2130 (x86_64) (Linux: 3.13.0-rc3_drm-intel-nightly_639e4d_20131210+ x86_64)
Test requirement not met in function read_rc6_residency, file pm_rc6_residency.c:77:
Last errno: 2, No such file or directory
Test requirement: (!(file))
Subtest rc6-residency-check: SKIP
Subtest rc6-residency-counter: SKIP

Signed-off-by: Wendy Wang <wendy.wang@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Wendy Wang 2014-06-09 16:36:47 +08:00 committed by Daniel Vetter
parent f4a7bd3b03
commit 748a46dcb9
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Makefile.sources
View File

@ -74,6 +74,7 @@ TESTS_progs_M = \
pm_lpsp \ pm_lpsp \
pm_rpm \ pm_rpm \
pm_rps \ pm_rps \
pm_rc6_residency \
prime_self_import \ prime_self_import \
template \ template \
$(NULL) $(NULL)
@ -140,7 +141,6 @@ TESTS_progs = \
kms_sink_crc_basic \ kms_sink_crc_basic \
kms_fence_pin_leak \ kms_fence_pin_leak \
pm_psr \ pm_psr \
pm_rc6_residency \
prime_udl \ prime_udl \
$(NULL) $(NULL)

27
tests/pm_rc6_residency.c
View File

@ -38,7 +38,6 @@
#define SLEEP_DURATION 3000 // in milliseconds #define SLEEP_DURATION 3000 // in milliseconds
#define RC6_FUDGE 900 // in milliseconds #define RC6_FUDGE 900 // in milliseconds
static unsigned int readit(const char *path) static unsigned int readit(const char *path)
{ {
unsigned int ret; unsigned int ret;
@ -60,6 +59,7 @@ static unsigned int readit(const char *path)
static void read_rc6_residency( int value[], const char *name_of_rc6_residency[]) static void read_rc6_residency( int value[], const char *name_of_rc6_residency[])
{ {
unsigned int i;
const int device = drm_get_card(); const int device = drm_get_card();
char *path ; char *path ;
int ret; int ret;
@ -72,32 +72,33 @@ static void read_rc6_residency( int value[], const char *name_of_rc6_residency[]
ret = asprintf(&path, "/sys/class/drm/card%d/power/rc6_enable", device); ret = asprintf(&path, "/sys/class/drm/card%d/power/rc6_enable", device);
igt_assert(ret != -1); igt_assert(ret != -1);
file = fopen(path, "r");//open file = fopen(path, "r");
igt_require(file); igt_require(file);
/* claim success if no rc6 enabled. */ /* claim success if no rc6 enabled. */
if (readit(path) == 0) if (readit(path) == 0)
igt_success(); igt_success();
for(unsigned int i = 0; i < 6; i++) for(i = 0; i < 6; i++)
{ {
if(i == 3) if(i == 3)
sleep(SLEEP_DURATION / 1000); sleep(SLEEP_DURATION / 1000);
ret = asprintf(&path, "/sys/class/drm/card%d/power/%s_residency_ms",device,name_of_rc6_residency[i % 3] ); ret = asprintf(&path, "/sys/class/drm/card%d/power/%s_residency_ms",device,name_of_rc6_residency[i % 3]);
igt_assert(ret != -1); igt_assert(ret != -1);
value[i] = readit(path); value[i] = readit(path);
} }
free(path); free(path);
} }
static void rc6_residency_counter(int value[],const char * name_of_rc6_residency[]) static void rc6_residency_counter(int value[],const char *name_of_rc6_residency[])
{ {
int flag;
unsigned int flag_counter,flag_support; unsigned int flag_counter,flag_support;
double counter_result = 0; double counter_result = 0;
flag_counter = 0; flag_counter = 0;
flag_support = 0; flag_support = 0;
for(int flag = NUMBER_OF_RC6_RESIDENCY-1; flag >= 0 ; flag --) for(flag = NUMBER_OF_RC6_RESIDENCY-1; flag >= 0; flag --)
{ {
unsigned int tmp_counter, tmp_support; unsigned int tmp_counter, tmp_support;
double counter; double counter;
@ -124,11 +125,10 @@ static void rc6_residency_counter(int value[],const char * name_of_rc6_residency
flag_support = flag_support << 1; flag_support = flag_support << 1;
} }
printf("The residency counter : %f \n", counter_result); printf("The residency counter: %f \n", counter_result);
igt_assert_f(flag_counter != 0 , "The RC6 residency counter is not good.\n"); igt_skip_on_f(flag_support == 0 , "This machine didn't entry any RC6 state.\n");
igt_assert_f(flag_support != 0 , "This machine doesn't support any RC6 state!\n"); igt_assert_f((flag_counter != 0) && (counter_result <=1) , "Sysfs RC6 residency counter is inaccurate.\n");
igt_assert_f(counter_result <=1 , "Debug files must be wrong \n");
printf("This machine entry %s state.\n", name_of_rc6_residency[(flag_counter / 2) - 1]); printf("This machine entry %s state.\n", name_of_rc6_residency[(flag_counter / 2) - 1]);
} }
@ -148,22 +148,23 @@ static void rc6_residency_check(int value[])
igt_main igt_main
{ {
int value[6];
int fd; int fd;
const char * name_of_rc6_residency[3]={"rc6","rc6p","rc6pp"}; int value[6];
const char *name_of_rc6_residency[3]={"rc6","rc6p","rc6pp"};
igt_skip_on_simulation(); igt_skip_on_simulation();
/* Use drm_open_any to verify device existence */ /* Use drm_open_any to verify device existence */
igt_fixture {
fd = drm_open_any(); fd = drm_open_any();
close(fd); close(fd);
read_rc6_residency(value, name_of_rc6_residency); read_rc6_residency(value, name_of_rc6_residency);
}
igt_subtest("rc6-residency-check") igt_subtest("rc6-residency-check")
rc6_residency_check(value); rc6_residency_check(value);
igt_subtest("rc6-residency-counter") igt_subtest("rc6-residency-counter")
rc6_residency_counter(value, name_of_rc6_residency); rc6_residency_counter(value, name_of_rc6_residency);
} }