More fixes for igt pm_rps

More fixes for igt pm_rps

[jeff.mcgee]

From: Jeff McGee <jeff.mcgee@intel.com>

Jeff McGee (3):
  pm_rps: Add read back checking on sysfs writes
  pm_rps: Convert to subtest structure
  pm_rps: Fix verbose option and streamline its use

 tests/pm_rps.c | 142 +++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 92 insertions(+), 50 deletions(-)

-- 
1.8.5.2

[PATCH 1/3] pm_rps: Add read back checking on sysfs writes

[jeff.mcgee]

From: Jeff McGee <jeff.mcgee@intel.com>

Signed-off-by: Jeff McGee <jeff.mcgee@intel.com>
---
 tests/pm_rps.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/pm_rps.c b/tests/pm_rps.c
index 7c739b6..ec07dd2 100644
--- a/tests/pm_rps.c
+++ b/tests/pm_rps.c
@@ -68,15 +68,20 @@ static int readval(FILE *filp)
 
 static int do_writeval(FILE *filp, int val, int lerrno)
 {
-	int ret;
+	int ret, orig;
+
+	orig = readval(filp);
 	rewind(filp);
 	ret = fprintf(filp, "%d", val);
+
 	if (lerrno) {
 		/* Expecting specific error */
 		igt_assert(ret == EOF && errno == lerrno);
+		igt_assert(readval(filp) == orig);
 	} else {
 		/* Expecting no error */
 		igt_assert(ret != EOF);
+		igt_assert(readval(filp) == val);
 	}
 
 	return ret;
-- 
1.8.5.2

[PATCH 2/3] pm_rps: Convert to subtest structure

[jeff.mcgee]

From: Jeff McGee <jeff.mcgee@intel.com>

Signed-off-by: Jeff McGee <jeff.mcgee@intel.com>
---
 tests/pm_rps.c | 119 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 62 insertions(+), 57 deletions(-)

diff --git a/tests/pm_rps.c b/tests/pm_rps.c
index ec07dd2..4d64f0a 100644
--- a/tests/pm_rps.c
+++ b/tests/pm_rps.c
@@ -142,66 +142,71 @@ static void pm_rps_exit_handler(int sig)
 	}
 }
 
-igt_simple_main
+igt_main
 {
-	const int device = drm_get_card();
-	struct junk *junk = stuff;
-	int fd, ret;
-
 	igt_skip_on_simulation();
 
-	/* Use drm_open_any to verify device existence */
-	fd = drm_open_any();
-	close(fd);
-
-	do {
-		int val = -1;
-		char *path;
-		ret = asprintf(&path, sysfs_base_path, device, junk->name);
-		igt_assert(ret != -1);
-		junk->filp = fopen(path, junk->mode);
-		igt_require(junk->filp);
-		setbuf(junk->filp, NULL);
-
-		val = readval(junk->filp);
-		igt_assert(val >= 0);
-		junk++;
-	} while(junk->name != NULL);
-
-	origmin = fmin;
-	origmax = fmax;
-
-	igt_install_exit_handler(pm_rps_exit_handler);
-
-	if (verbose)
-		printf("Original min = %d\nOriginal max = %d\n", origmin, origmax);
-
-	if (verbose)
-		dumpit();
-
-	checkit();
-	setfreq(origmin);
-	if (verbose)
-		dumpit();
-	igt_assert(fcur == fmin);
-	setfreq(origmax);
-	if (verbose)
-		dumpit();
-	igt_assert(fcur == fmax);
-	checkit();
-
-	/* And some errors */
-	writeval_inval(stuff[MIN].filp, frpn - 1);
-	writeval_inval(stuff[MAX].filp, frp0 + 1000);
-	checkit();
-
-	writeval_inval(stuff[MIN].filp, fmax + 1000);
-	writeval_inval(stuff[MAX].filp, fmin - 1);
-	checkit();
+	igt_fixture {
+		const int device = drm_get_card();
+		struct junk *junk = stuff;
+		int fd, ret;
+
+		/* Use drm_open_any to verify device existence */
+		fd = drm_open_any();
+		close(fd);
+
+		do {
+			int val = -1;
+			char *path;
+			ret = asprintf(&path, sysfs_base_path, device, junk->name);
+			igt_assert(ret != -1);
+			junk->filp = fopen(path, junk->mode);
+			igt_require(junk->filp);
+			setbuf(junk->filp, NULL);
+
+			val = readval(junk->filp);
+			igt_assert(val >= 0);
+			junk++;
+		} while(junk->name != NULL);
+
+		origmin = fmin;
+		origmax = fmax;
+
+		igt_install_exit_handler(pm_rps_exit_handler);
+	}
 
-	writeval_inval(stuff[MIN].filp, 0x11111110);
-	writeval_inval(stuff[MAX].filp, 0);
+	igt_subtest("min-max-config-at-idle") {
+		if (verbose)
+			printf("Original min = %d\nOriginal max = %d\n",
+			        origmin, origmax);
+
+		if (verbose)
+			dumpit();
+
+		checkit();
+		setfreq(origmin);
+		if (verbose)
+			dumpit();
+		igt_assert(fcur == fmin);
+		setfreq(origmax);
+		if (verbose)
+			dumpit();
+		igt_assert(fcur == fmax);
+		checkit();
+
+		/* And some errors */
+		writeval_inval(stuff[MIN].filp, frpn - 1);
+		writeval_inval(stuff[MAX].filp, frp0 + 1000);
+		checkit();
+
+		writeval_inval(stuff[MIN].filp, fmax + 1000);
+		writeval_inval(stuff[MAX].filp, fmin - 1);
+		checkit();
+
+		writeval_inval(stuff[MIN].filp, 0x11111110);
+		writeval_inval(stuff[MAX].filp, 0);
 
-	writeval(stuff[MIN].filp, origmin);
-	writeval(stuff[MAX].filp, origmax);
+		writeval(stuff[MIN].filp, origmin);
+		writeval(stuff[MAX].filp, origmax);
+	}
 }
-- 
1.8.5.2

Re: [PATCH 2/3] pm_rps: Convert to subtest structure

[Daniel Vetter]

On Fri, Jan 17, 2014 at 04:56:05PM -0600, jeff.mcgee@intel.com wrote:
> From: Jeff McGee <jeff.mcgee@intel.com>
> 
> Signed-off-by: Jeff McGee <jeff.mcgee@intel.com>

I've missed that you've forgotten to move the test to the _M Makefile
target. Without that testrunners like piglit won't enumerate the subtests
and run the individually. I've fixed this up now.
-Daniel

> ---
>  tests/pm_rps.c | 119 ++++++++++++++++++++++++++++++---------------------------
>  1 file changed, 62 insertions(+), 57 deletions(-)
> 
> diff --git a/tests/pm_rps.c b/tests/pm_rps.c
> index ec07dd2..4d64f0a 100644
> --- a/tests/pm_rps.c
> +++ b/tests/pm_rps.c
> @@ -142,66 +142,71 @@ static void pm_rps_exit_handler(int sig)
>  	}
>  }
>  
> -igt_simple_main
> +igt_main
>  {
> -	const int device = drm_get_card();
> -	struct junk *junk = stuff;
> -	int fd, ret;
> -
>  	igt_skip_on_simulation();
>  
> -	/* Use drm_open_any to verify device existence */
> -	fd = drm_open_any();
> -	close(fd);
> -
> -	do {
> -		int val = -1;
> -		char *path;
> -		ret = asprintf(&path, sysfs_base_path, device, junk->name);
> -		igt_assert(ret != -1);
> -		junk->filp = fopen(path, junk->mode);
> -		igt_require(junk->filp);
> -		setbuf(junk->filp, NULL);
> -
> -		val = readval(junk->filp);
> -		igt_assert(val >= 0);
> -		junk++;
> -	} while(junk->name != NULL);
> -
> -	origmin = fmin;
> -	origmax = fmax;
> -
> -	igt_install_exit_handler(pm_rps_exit_handler);
> -
> -	if (verbose)
> -		printf("Original min = %d\nOriginal max = %d\n", origmin, origmax);
> -
> -	if (verbose)
> -		dumpit();
> -
> -	checkit();
> -	setfreq(origmin);
> -	if (verbose)
> -		dumpit();
> -	igt_assert(fcur == fmin);
> -	setfreq(origmax);
> -	if (verbose)
> -		dumpit();
> -	igt_assert(fcur == fmax);
> -	checkit();
> -
> -	/* And some errors */
> -	writeval_inval(stuff[MIN].filp, frpn - 1);
> -	writeval_inval(stuff[MAX].filp, frp0 + 1000);
> -	checkit();
> -
> -	writeval_inval(stuff[MIN].filp, fmax + 1000);
> -	writeval_inval(stuff[MAX].filp, fmin - 1);
> -	checkit();
> +	igt_fixture {
> +		const int device = drm_get_card();
> +		struct junk *junk = stuff;
> +		int fd, ret;
> +
> +		/* Use drm_open_any to verify device existence */
> +		fd = drm_open_any();
> +		close(fd);
> +
> +		do {
> +			int val = -1;
> +			char *path;
> +			ret = asprintf(&path, sysfs_base_path, device, junk->name);
> +			igt_assert(ret != -1);
> +			junk->filp = fopen(path, junk->mode);
> +			igt_require(junk->filp);
> +			setbuf(junk->filp, NULL);
> +
> +			val = readval(junk->filp);
> +			igt_assert(val >= 0);
> +			junk++;
> +		} while(junk->name != NULL);
> +
> +		origmin = fmin;
> +		origmax = fmax;
> +
> +		igt_install_exit_handler(pm_rps_exit_handler);
> +	}
>  
> -	writeval_inval(stuff[MIN].filp, 0x11111110);
> -	writeval_inval(stuff[MAX].filp, 0);
> +	igt_subtest("min-max-config-at-idle") {
> +		if (verbose)
> +			printf("Original min = %d\nOriginal max = %d\n",
> +			        origmin, origmax);
> +
> +		if (verbose)
> +			dumpit();
> +
> +		checkit();
> +		setfreq(origmin);
> +		if (verbose)
> +			dumpit();
> +		igt_assert(fcur == fmin);
> +		setfreq(origmax);
> +		if (verbose)
> +			dumpit();
> +		igt_assert(fcur == fmax);
> +		checkit();
> +
> +		/* And some errors */
> +		writeval_inval(stuff[MIN].filp, frpn - 1);
> +		writeval_inval(stuff[MAX].filp, frp0 + 1000);
> +		checkit();
> +
> +		writeval_inval(stuff[MIN].filp, fmax + 1000);
> +		writeval_inval(stuff[MAX].filp, fmin - 1);
> +		checkit();
> +
> +		writeval_inval(stuff[MIN].filp, 0x11111110);
> +		writeval_inval(stuff[MAX].filp, 0);
>  
> -	writeval(stuff[MIN].filp, origmin);
> -	writeval(stuff[MAX].filp, origmax);
> +		writeval(stuff[MIN].filp, origmin);
> +		writeval(stuff[MAX].filp, origmax);
> +	}
>  }
> -- 
> 1.8.5.2
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

[PATCH 3/3] pm_rps: Fix verbose option and streamline its use

[jeff.mcgee]

From: Jeff McGee <jeff.mcgee@intel.com>

Signed-off-by: Jeff McGee <jeff.mcgee@intel.com>
---
 tests/pm_rps.c | 52 ++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 42 insertions(+), 10 deletions(-)

diff --git a/tests/pm_rps.c b/tests/pm_rps.c
index 4d64f0a..192dca7 100644
--- a/tests/pm_rps.c
+++ b/tests/pm_rps.c
@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <getopt.h>
 #include "drmtest.h"
 
 static bool verbose = false;
@@ -130,6 +131,8 @@ static void dumpit(void)
 
 	printf("\n");
 }
+#define dump() if (verbose) dumpit()
+#define log(...) if (verbose) printf(__VA_ARGS__)
 
 static void pm_rps_exit_handler(int sig)
 {
@@ -142,8 +145,40 @@ static void pm_rps_exit_handler(int sig)
 	}
 }
 
-igt_main
+static int opt_handler(int opt, int opt_index)
 {
+	switch (opt) {
+	case 'v':
+		verbose = true;
+		break;
+	default:
+		assert(0);
+	}
+
+	return 0;
+}
+
+/* Mod of igt_subtest_init that adds our extra options */
+void subtest_init(int argc, char **argv)
+{
+	struct option long_opts[] = {
+		{"verbose", 0, 0, 'v'}
+	};
+	const char *help_str = "  -v, --verbose";
+	int ret;
+
+	ret = igt_subtest_init_parse_opts(argc, argv, "v", long_opts,
+					  help_str, opt_handler);
+
+	if (ret < 0)
+		/* exit with no error for -h/--help */
+		exit(ret == -1 ? 0 : ret);
+}
+
+int main(int argc, char **argv)
+{
+	subtest_init(argc, argv);
+
 	igt_skip_on_simulation();
 
 	igt_fixture {
@@ -176,21 +211,16 @@ igt_main
 	}
 
 	igt_subtest("min-max-config-at-idle") {
-		if (verbose)
-			printf("Original min = %d\nOriginal max = %d\n",
-			        origmin, origmax);
+		log("Original min = %d\nOriginal max = %d\n", origmin, origmax);
 
-		if (verbose)
-			dumpit();
+		dump();
 
 		checkit();
 		setfreq(origmin);
-		if (verbose)
-			dumpit();
+		dump();
 		igt_assert(fcur == fmin);
 		setfreq(origmax);
-		if (verbose)
-			dumpit();
+		dump();
 		igt_assert(fcur == fmax);
 		checkit();
 
@@ -209,4 +239,6 @@ igt_main
 		writeval(stuff[MIN].filp, origmin);
 		writeval(stuff[MAX].filp, origmax);
 	}
+
+	igt_exit();
 }
-- 
1.8.5.2

Re: [PATCH 3/3] pm_rps: Fix verbose option and streamline its use

[Daniel Vetter]

On Fri, Jan 17, 2014 at 04:56:06PM -0600, jeff.mcgee@intel.com wrote:
> From: Jeff McGee <jeff.mcgee@intel.com>
> 
> Signed-off-by: Jeff McGee <jeff.mcgee@intel.com>

Ah, now I understand your question for a unified verbose handling. I guess
if someone is bored (or if there's a need in testrunner frameworks for it)
we could add a bit of infrastructure for verbose logging and similar
things. I'll add a note on our i-g-t ideas wiki page.

All patches merged, thanks.
-Daniel

> ---
>  tests/pm_rps.c | 52 ++++++++++++++++++++++++++++++++++++++++++----------
>  1 file changed, 42 insertions(+), 10 deletions(-)
> 
> diff --git a/tests/pm_rps.c b/tests/pm_rps.c
> index 4d64f0a..192dca7 100644
> --- a/tests/pm_rps.c
> +++ b/tests/pm_rps.c
> @@ -31,6 +31,7 @@
>  #include <stdlib.h>
>  #include <string.h>
>  #include <unistd.h>
> +#include <getopt.h>
>  #include "drmtest.h"
>  
>  static bool verbose = false;
> @@ -130,6 +131,8 @@ static void dumpit(void)
>  
>  	printf("\n");
>  }
> +#define dump() if (verbose) dumpit()
> +#define log(...) if (verbose) printf(__VA_ARGS__)
>  
>  static void pm_rps_exit_handler(int sig)
>  {
> @@ -142,8 +145,40 @@ static void pm_rps_exit_handler(int sig)
>  	}
>  }
>  
> -igt_main
> +static int opt_handler(int opt, int opt_index)
>  {
> +	switch (opt) {
> +	case 'v':
> +		verbose = true;
> +		break;
> +	default:
> +		assert(0);
> +	}
> +
> +	return 0;
> +}
> +
> +/* Mod of igt_subtest_init that adds our extra options */
> +void subtest_init(int argc, char **argv)
> +{
> +	struct option long_opts[] = {
> +		{"verbose", 0, 0, 'v'}
> +	};
> +	const char *help_str = "  -v, --verbose";
> +	int ret;
> +
> +	ret = igt_subtest_init_parse_opts(argc, argv, "v", long_opts, 
> +					  help_str, opt_handler);
> +
> +	if (ret < 0)
> +		/* exit with no error for -h/--help */
> +		exit(ret == -1 ? 0 : ret);
> +}
> +
> +int main(int argc, char **argv)
> +{
> +	subtest_init(argc, argv);
> +
>  	igt_skip_on_simulation();
>  
>  	igt_fixture {
> @@ -176,21 +211,16 @@ igt_main
>  	}
>  
>  	igt_subtest("min-max-config-at-idle") {
> -		if (verbose)
> -			printf("Original min = %d\nOriginal max = %d\n",
> -			        origmin, origmax);
> +		log("Original min = %d\nOriginal max = %d\n", origmin, origmax);
>  
> -		if (verbose)
> -			dumpit();
> +		dump();
>  
>  		checkit();
>  		setfreq(origmin);
> -		if (verbose)
> -			dumpit();
> +		dump();
>  		igt_assert(fcur == fmin);
>  		setfreq(origmax);
> -		if (verbose)
> -			dumpit();
> +		dump();
>  		igt_assert(fcur == fmax);
>  		checkit();
>  
> @@ -209,4 +239,6 @@ igt_main
>  		writeval(stuff[MIN].filp, origmin);
>  		writeval(stuff[MAX].filp, origmax);
>  	}
> +
> +	igt_exit();
>  }
> -- 
> 1.8.5.2
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

Re: [PATCH 3/3] pm_rps: Fix verbose option and streamline its use

[Daniel Vetter]

On Fri, Jan 17, 2014 at 04:56:06PM -0600, jeff.mcgee@intel.com wrote:
> From: Jeff McGee <jeff.mcgee@intel.com>
> 
> Signed-off-by: Jeff McGee <jeff.mcgee@intel.com>
> ---
>  tests/pm_rps.c | 52 ++++++++++++++++++++++++++++++++++++++++++----------
>  1 file changed, 42 insertions(+), 10 deletions(-)
> 
> diff --git a/tests/pm_rps.c b/tests/pm_rps.c
> index 4d64f0a..192dca7 100644
> --- a/tests/pm_rps.c
> +++ b/tests/pm_rps.c
> @@ -31,6 +31,7 @@
>  #include <stdlib.h>
>  #include <string.h>
>  #include <unistd.h>
> +#include <getopt.h>
>  #include "drmtest.h"
>  
>  static bool verbose = false;
> @@ -130,6 +131,8 @@ static void dumpit(void)
>  
>  	printf("\n");
>  }
> +#define dump() if (verbose) dumpit()
> +#define log(...) if (verbose) printf(__VA_ARGS__)
>  
>  static void pm_rps_exit_handler(int sig)
>  {
> @@ -142,8 +145,40 @@ static void pm_rps_exit_handler(int sig)
>  	}
>  }
>  
> -igt_main
> +static int opt_handler(int opt, int opt_index)
>  {
> +	switch (opt) {
> +	case 'v':
> +		verbose = true;
> +		break;
> +	default:
> +		assert(0);
> +	}
> +
> +	return 0;
> +}
> +
> +/* Mod of igt_subtest_init that adds our extra options */
> +void subtest_init(int argc, char **argv)

Missing static here. I've added it back in.
-Daniel

> +{
> +	struct option long_opts[] = {
> +		{"verbose", 0, 0, 'v'}
> +	};
> +	const char *help_str = "  -v, --verbose";
> +	int ret;
> +
> +	ret = igt_subtest_init_parse_opts(argc, argv, "v", long_opts,
> +					  help_str, opt_handler);
> +
> +	if (ret < 0)
> +		/* exit with no error for -h/--help */
> +		exit(ret == -1 ? 0 : ret);
> +}
> +
> +int main(int argc, char **argv)
> +{
> +	subtest_init(argc, argv);
> +
>  	igt_skip_on_simulation();
>  
>  	igt_fixture {
> @@ -176,21 +211,16 @@ igt_main
>  	}
>  
>  	igt_subtest("min-max-config-at-idle") {
> -		if (verbose)
> -			printf("Original min = %d\nOriginal max = %d\n",
> -			        origmin, origmax);
> +		log("Original min = %d\nOriginal max = %d\n", origmin, origmax);
>  
> -		if (verbose)
> -			dumpit();
> +		dump();
>  
>  		checkit();
>  		setfreq(origmin);
> -		if (verbose)
> -			dumpit();
> +		dump();
>  		igt_assert(fcur == fmin);
>  		setfreq(origmax);
> -		if (verbose)
> -			dumpit();
> +		dump();
>  		igt_assert(fcur == fmax);
>  		checkit();
>  
> @@ -209,4 +239,6 @@ igt_main
>  		writeval(stuff[MIN].filp, origmin);
>  		writeval(stuff[MAX].filp, origmax);
>  	}
> +
> +	igt_exit();
>  }
> -- 
> 1.8.5.2
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch