All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/3] test/pm_rps: use igt logging
       [not found] <AKMK7uG_t34vYaAh7mxWiYyHYb4svjYGJtRys-GYjQBJzXALGA@mail.gmail.com>
@ 2014-02-13 13:27 ` Daniel Vetter
  2014-02-13 13:27   ` [PATCH 2/3] tests/gem_seqno_wrap: " Daniel Vetter
  2014-02-13 13:27   ` [PATCH 3/3] tests/kms_flip: " Daniel Vetter
  0 siblings, 2 replies; 3+ messages in thread
From: Daniel Vetter @ 2014-02-13 13:27 UTC (permalink / raw)
  To: Intel Graphics Development; +Cc: Daniel Vetter

Cc: Jeff McGee <jeff.mcgee@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 tests/pm_rps.c | 112 +++++++++++++++++++--------------------------------------
 1 file changed, 37 insertions(+), 75 deletions(-)

diff --git a/tests/pm_rps.c b/tests/pm_rps.c
index 3d374f92f82d..a652cf580dc7 100644
--- a/tests/pm_rps.c
+++ b/tests/pm_rps.c
@@ -40,8 +40,6 @@
 #include "intel_batchbuffer.h"
 #include "igt_debugfs.h"
 
-static bool verbose = false;
-
 static int drm_fd;
 
 static const char sysfs_base_path[] = "/sys/class/drm/card%d/gt_%s_freq_mhz";
@@ -133,18 +131,16 @@ static void matchit(const int *freqs1, const int *freqs2)
 	igt_assert(freqs1[RPn] == freqs2[RPn]);
 }
 
-static void dumpit(const int *freqs)
+static void dump(const int *freqs)
 {
 	int i;
 
-	printf("gt freq (MHz):");
+	igt_debug("gt freq (MHz):");
 	for (i = 0; i < NUMFREQ; i++)
-		printf("  %s=%d", stuff[i].name, freqs[i]);
+		igt_debug("  %s=%d", stuff[i].name, freqs[i]);
 
-	printf("\n");
+	igt_debug("\n");
 }
-#define dump(x) if (verbose) dumpit(x)
-#define log(...) if (verbose) printf(__VA_ARGS__)
 
 enum load {
 	LOW,
@@ -229,7 +225,7 @@ static void load_helper_run(enum load load)
 		drm_intel_bo_map(lh.target_buffer, 0);
 		drm_intel_bo_unmap(lh.target_buffer);
 
-		log("load helper sent %u dword writes\n", val);
+		igt_debug("load helper sent %u dword writes\n", val);
 	}
 }
 
@@ -262,27 +258,27 @@ static void load_helper_init(void)
 	/* MI_STORE_DATA can only use GTT address on gen4+/g33 and needs
 	 * snoopable mem on pre-gen6. */
 	if (intel_gen(lh.devid) < 6) {
-		log("load helper init failed: pre-gen6 not supported\n");
+		igt_debug("load helper init failed: pre-gen6 not supported\n");
 		return;
 	}
 
 	lh.bufmgr = drm_intel_bufmgr_gem_init(drm_fd, 4096);
 	if (!lh.bufmgr) {
-		log("load helper init failed: buffer manager init\n");
+		igt_debug("load helper init failed: buffer manager init\n");
 		return;
 	}
 	drm_intel_bufmgr_gem_enable_reuse(lh.bufmgr);
 
 	lh.batch = intel_batchbuffer_alloc(lh.bufmgr, lh.devid);
 	if (!lh.batch) {
-		log("load helper init failed: batch buffer alloc\n");
+		igt_debug("load helper init failed: batch buffer alloc\n");
 		return;
 	}
 
 	lh.target_buffer = drm_intel_bo_alloc(lh.bufmgr, "target bo",
 					      4096, 4096);
 	if (!lh.target_buffer) {
-		log("load helper init failed: target buffer alloc\n");
+		igt_debug("load helper init failed: target buffer alloc\n");
 		return;
 	}
 
@@ -312,7 +308,7 @@ static void stop_rings(void)
 	fd = igt_debugfs_open(&dfs, "i915_ring_stop", O_WRONLY);
 	igt_assert(fd >= 0);
 
-	log("injecting ring stop\n");
+	igt_debug("injecting ring stop\n");
 	igt_assert(write(fd, data, sizeof(data)) == sizeof(data));
 
 	close(fd);
@@ -342,67 +338,67 @@ static void min_max_config(void (*check)(void))
 	/* hw (and so kernel) currently rounds to 50 MHz ... */
 	fmid = fmid / 50 * 50;
 
-	log("\nCheck original min and max...\n");
+	igt_debug("\nCheck original min and max...\n");
 	check();
 
-	log("\nSet min=RPn and max=RP0...\n");
+	igt_debug("\nSet min=RPn and max=RP0...\n");
 	writeval(stuff[MIN].filp, origfreqs[RPn]);
 	writeval(stuff[MAX].filp, origfreqs[RP0]);
 	check();
 
-	log("\nIncrease min to midpoint...\n");
+	igt_debug("\nIncrease min to midpoint...\n");
 	writeval(stuff[MIN].filp, fmid);
 	check();
 
-	log("\nIncrease min to RP0...\n");
+	igt_debug("\nIncrease min to RP0...\n");
 	writeval(stuff[MIN].filp, origfreqs[RP0]);
 	check();
 
-	log("\nIncrease min above RP0 (invalid)...\n");
+	igt_debug("\nIncrease min above RP0 (invalid)...\n");
 	writeval_inval(stuff[MIN].filp, origfreqs[RP0] + 1000);
 	check();
 
-	log("\nDecrease max to RPn (invalid)...\n");
+	igt_debug("\nDecrease max to RPn (invalid)...\n");
 	writeval_inval(stuff[MAX].filp, origfreqs[RPn]);
 	check();
 
-	log("\nDecrease min to midpoint...\n");
+	igt_debug("\nDecrease min to midpoint...\n");
 	writeval(stuff[MIN].filp, fmid);
 	check();
 
-	log("\nDecrease min to RPn...\n");
+	igt_debug("\nDecrease min to RPn...\n");
 	writeval(stuff[MIN].filp, origfreqs[RPn]);
 	check();
 
-	log("\nDecrease min below RPn (invalid)...\n");
+	igt_debug("\nDecrease min below RPn (invalid)...\n");
 	writeval_inval(stuff[MIN].filp, 0);
 	check();
 
-	log("\nDecrease max to midpoint...\n");
+	igt_debug("\nDecrease max to midpoint...\n");
 	writeval(stuff[MAX].filp, fmid);
 	check();
 
-	log("\nDecrease max to RPn...\n");
+	igt_debug("\nDecrease max to RPn...\n");
 	writeval(stuff[MAX].filp, origfreqs[RPn]);
 	check();
 
-	log("\nDecrease max below RPn (invalid)...\n");
+	igt_debug("\nDecrease max below RPn (invalid)...\n");
 	writeval_inval(stuff[MAX].filp, 0);
 	check();
 
-	log("\nIncrease min to RP0 (invalid)...\n");
+	igt_debug("\nIncrease min to RP0 (invalid)...\n");
 	writeval_inval(stuff[MIN].filp, origfreqs[RP0]);
 	check();
 
-	log("\nIncrease max to midpoint...\n");
+	igt_debug("\nIncrease max to midpoint...\n");
 	writeval(stuff[MAX].filp, fmid);
 	check();
 
-	log("\nIncrease max to RP0...\n");
+	igt_debug("\nIncrease max to RP0...\n");
 	writeval(stuff[MAX].filp, origfreqs[RP0]);
 	check();
 
-	log("\nIncrease max above RP0 (invalid)...\n");
+	igt_debug("\nIncrease max above RP0 (invalid)...\n");
 	writeval_inval(stuff[MAX].filp, origfreqs[RP0] + 1000);
 	check();
 
@@ -439,7 +435,7 @@ static void idle_check(void)
 	} while (wait < IDLE_WAIT_TIMEOUT_MSEC);
 
 	igt_assert(freqs[CUR] == freqs[MIN]);
-	log("Required %d msec to reach cur=min\n", wait);
+	igt_debug("Required %d msec to reach cur=min\n", wait);
 }
 
 #define LOADED_WAIT_TIMESTEP_MSEC 100
@@ -462,7 +458,7 @@ static void loaded_check(void)
 	} while (wait < LOADED_WAIT_TIMEOUT_MSEC);
 
 	igt_assert(freqs[CUR] == freqs[MAX]);
-	log("Required %d msec to reach cur=max\n", wait);
+	igt_debug("Required %d msec to reach cur=max\n", wait);
 }
 
 #define STABILIZE_WAIT_TIMESTEP_MSEC 100
@@ -478,7 +474,7 @@ static void stabilize_check(int *freqs)
 		wait += STABILIZE_WAIT_TIMESTEP_MSEC;
 	} while (wait < STABILIZE_WAIT_TIMEOUT_MSEC);
 
-	log("Waited %d msec to stabilize cur\n", wait);
+	igt_debug("Waited %d msec to stabilize cur\n", wait);
 }
 
 static void reset(void)
@@ -486,30 +482,30 @@ static void reset(void)
 	int pre_freqs[NUMFREQ];
 	int post_freqs[NUMFREQ];
 
-	log("Apply low load...\n");
+	igt_debug("Apply low load...\n");
 	load_helper_run(LOW);
 	stabilize_check(pre_freqs);
 
-	log("Stop rings...\n");
+	igt_debug("Stop rings...\n");
 	stop_rings();
 	while (rings_stopped())
 		usleep(1000 * 100);
-	log("Ring stop cleared\n");
+	igt_debug("Ring stop cleared\n");
 
-	log("Apply high load...\n");
+	igt_debug("Apply high load...\n");
 	load_helper_set_load(HIGH);
 	loaded_check();
 
-	log("Apply low load...\n");
+	igt_debug("Apply low load...\n");
 	load_helper_set_load(LOW);
 	stabilize_check(post_freqs);
 	matchit(pre_freqs, post_freqs);
 
-	log("Apply high load...\n");
+	igt_debug("Apply high load...\n");
 	load_helper_set_load(HIGH);
 	loaded_check();
 
-	log("Removing load...\n");
+	igt_debug("Removing load...\n");
 	load_helper_stop();
 	idle_check();
 }
@@ -528,40 +524,8 @@ static void pm_rps_exit_handler(int sig)
 	close(drm_fd);
 }
 
-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 */
-static void subtest_init(int argc, char **argv)
+igt_main
 {
-	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 {
@@ -609,6 +573,4 @@ int main(int argc, char **argv)
 
 	igt_subtest("reset")
 		reset();
-
-	igt_exit();
 }
-- 
1.8.1.4

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [PATCH 2/3] tests/gem_seqno_wrap: use igt logging
  2014-02-13 13:27 ` [PATCH 1/3] test/pm_rps: use igt logging Daniel Vetter
@ 2014-02-13 13:27   ` Daniel Vetter
  2014-02-13 13:27   ` [PATCH 3/3] tests/kms_flip: " Daniel Vetter
  1 sibling, 0 replies; 3+ messages in thread
From: Daniel Vetter @ 2014-02-13 13:27 UTC (permalink / raw)
  To: Intel Graphics Development; +Cc: Daniel Vetter

Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 tests/gem_seqno_wrap.c | 28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/tests/gem_seqno_wrap.c b/tests/gem_seqno_wrap.c
index e37365f1d45c..0d90df6b7db0 100644
--- a/tests/gem_seqno_wrap.c
+++ b/tests/gem_seqno_wrap.c
@@ -58,7 +58,6 @@ struct option_struct {
 	int rounds;
 	int background;
 	char cmd[1024];
-	int verbose;
 	int timeout;
 	int dontwrap;
 	int prewrap_space;
@@ -318,12 +317,6 @@ static int run_cmd(char *s)
 
 		igt_assert(snprintf(full_path, PATH_MAX, "%s/%s", path, wexp.we_wordv[0]) > 0);
 
-		/* if (!options.verbose) {
-			close(STDOUT_FILENO);
-			close(STDERR_FILENO);
-		}
-		*/
-
 		r = execv(full_path, wexp.we_wordv);
 		if (r == -1)
 			perror("execv failed");
@@ -404,8 +397,7 @@ static int __read_seqno(uint32_t *seqno)
 
 	*seqno = tmp;
 
-	if (options.verbose)
-		printf("next_seqno: 0x%x\n", *seqno);
+	igt_debug("next_seqno: 0x%x\n", *seqno);
 
 	return 0;
 }
@@ -449,8 +441,7 @@ static int write_seqno(uint32_t seqno)
 
 	last_seqno = seqno;
 
-	if (options.verbose)
-		printf("next_seqno set to: 0x%x\n", seqno);
+	igt_debug("next_seqno set to: 0x%x\n", seqno);
 
 	r = __read_seqno(&rb);
 	if (r < 0)
@@ -564,7 +555,6 @@ static void parse_options(int argc, char **argv)
 		{"background", no_argument, 0, 'b'},
 		{"timeout", required_argument, 0, 't'},
 		{"dontwrap", no_argument, 0, 'd'},
-		{"verbose", no_argument, 0, 'v'},
 		{"prewrap", required_argument, 0, 'p'},
 		{"norandom", no_argument, 0, 'r'},
 		{"buffers", required_argument, 0, 'i'},
@@ -575,7 +565,6 @@ static void parse_options(int argc, char **argv)
 	options.background = 0;
 	options.dontwrap = 0;
 	options.timeout = 20;
-	options.verbose = 0;
 	options.random = 1;
 	options.prewrap_space = 21;
 	options.buffers = 10;
@@ -611,9 +600,6 @@ static void parse_options(int argc, char **argv)
 			printf("setting timeout to %d seconds\n",
 			       options.timeout);
 			break;
-		case 'v':
-			options.verbose = 1;
-			break;
 		case 'r':
 			options.random = 0;
 			break;
@@ -660,16 +646,12 @@ int main(int argc, char **argv)
 
 		wcount++;
 
-		if (options.verbose) {
-			printf("%s done: %d\n",
-			       options.dontwrap ? "tests" : "wraps", wcount);
-			fflush(stdout);
-		}
+		igt_debug("%s done: %d\n",
+			  options.dontwrap ? "tests" : "wraps", wcount);
 	}
 
 	if (options.rounds == wcount) {
-		if (options.verbose)
-			printf("done %d wraps successfully\n", wcount);
+		igt_debug("done %d wraps successfully\n", wcount);
 		return 0;
 	}
 
-- 
1.8.1.4

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [PATCH 3/3] tests/kms_flip: use igt logging
  2014-02-13 13:27 ` [PATCH 1/3] test/pm_rps: use igt logging Daniel Vetter
  2014-02-13 13:27   ` [PATCH 2/3] tests/gem_seqno_wrap: " Daniel Vetter
@ 2014-02-13 13:27   ` Daniel Vetter
  1 sibling, 0 replies; 3+ messages in thread
From: Daniel Vetter @ 2014-02-13 13:27 UTC (permalink / raw)
  To: Intel Graphics Development; +Cc: Daniel Vetter

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 tests/kms_flip.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index c397c9049d82..6b448be1267e 100644
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -862,7 +862,7 @@ static unsigned int run_test_step(struct test_output *o)
 	if (o->flags & TEST_DPMS)
 		set_dpms(o, DRM_MODE_DPMS_ON);
 
-	printf("."); fflush(stdout);
+	igt_log("."); fflush(stdout);
 
 	if (do_flip && (o->flags & TEST_HANG)) {
 		handle = gem_create(drm_fd, 4096);
@@ -1218,7 +1218,7 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,
 
 	last_connector = o->kconnector[0];
 
-	fprintf(stdout, "Beginning %s\n", test_name);
+	igt_log("Beginning %s\n", test_name);
 
 	if (o->flags & TEST_PAN)
 		o->fb_width *= 2;
@@ -1284,7 +1284,7 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,
 	if (o->flags & TEST_VBLANK)
 		check_final_state(o, &o->vblank_state, elapsed);
 
-	fprintf(stdout, "\n%s: PASSED\n\n", test_name);
+	igt_log("\n%s: PASSED\n\n", test_name);
 
 out:
 	kmstest_remove_fb(drm_fd, &o->fb_info[2]);
@@ -1429,7 +1429,7 @@ static void get_timestamp_format(void)
 	ret = drmGetCap(drm_fd, DRM_CAP_TIMESTAMP_MONOTONIC, &cap_mono);
 	igt_assert(ret == 0 || errno == EINVAL);
 	monotonic_timestamp = ret == 0 && cap_mono == 1;
-	printf("Using %s timestamps\n",
+	igt_log("Using %s timestamps\n",
 		monotonic_timestamp ? "monotonic" : "real");
 }
 
-- 
1.8.1.4

^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-02-13 13:49 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <AKMK7uG_t34vYaAh7mxWiYyHYb4svjYGJtRys-GYjQBJzXALGA@mail.gmail.com>
2014-02-13 13:27 ` [PATCH 1/3] test/pm_rps: use igt logging Daniel Vetter
2014-02-13 13:27   ` [PATCH 2/3] tests/gem_seqno_wrap: " Daniel Vetter
2014-02-13 13:27   ` [PATCH 3/3] tests/kms_flip: " Daniel Vetter

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.