[PATCH i-g-t] tests/pm_rps: Move some test logic out of boost function

[PATCH i-g-t] tests/pm_rps: Move some test logic out of boost function

[Radoslaw Szwichtenberg]

Moving code out of the boost function will allow its usage
in other/new test scenarios.

Signed-off-by: Radoslaw Szwichtenberg <radoslaw.szwichtenberg@intel.com>
Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
---
 tests/pm_rps.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/tests/pm_rps.c b/tests/pm_rps.c
index 89f3e31c..dad87646 100644
--- a/tests/pm_rps.c
+++ b/tests/pm_rps.c
@@ -583,11 +583,6 @@ static void boost_freq(int fd, int *boost_freqs)
 	int64_t timeout = 1;
 	igt_spin_t *load;
 	unsigned int engine;
-	int fmid = (origfreqs[RPn] + origfreqs[RP0]) / 2;
-
-	fmid = get_hw_rounded_freq(fmid);
-	/* Set max freq to less then boost freq */
-	writeval(sysfs_files[MAX].filp, fmid);
 
 	/* Put boost on the same engine as low load */
 	engine = I915_EXEC_RENDER;
@@ -604,9 +599,6 @@ static void boost_freq(int fd, int *boost_freqs)
 	igt_spin_batch_end(load);
 	gem_sync(fd, load->handle);
 	igt_spin_batch_free(fd, load);
-
-	/* Set max freq to original softmax */
-	writeval(sysfs_files[MAX].filp, origfreqs[MAX]);
 }
 
 static void waitboost(int fd, bool reset)
@@ -615,6 +607,9 @@ static void waitboost(int fd, bool reset)
 	int boost_freqs[NUMFREQ];
 	int post_freqs[NUMFREQ];
 
+	int fmid = (origfreqs[RPn] + origfreqs[RP0]) / 2;
+	fmid = get_hw_rounded_freq(fmid);
+
 	load_helper_run(LOW);
 
 	igt_debug("Apply low load...\n");
@@ -627,11 +622,17 @@ static void waitboost(int fd, bool reset)
 		sleep(1);
 	}
 
+	/* Set max freq to less than boost freq */
+	writeval(sysfs_files[MAX].filp, fmid);
+
 	/* When we wait upon the GPU, we want to temporarily boost it
 	 * to maximum.
 	 */
 	boost_freq(fd, boost_freqs);
 
+	/* Set max freq to original softmax */
+	writeval(sysfs_files[MAX].filp, origfreqs[MAX]);
+
 	igt_debug("Apply low load again...\n");
 	sleep(1);
 	stabilize_check(post_freqs);
@@ -643,7 +644,6 @@ static void waitboost(int fd, bool reset)
 	igt_assert_lt(pre_freqs[CUR], pre_freqs[MAX]);
 	igt_assert_eq(boost_freqs[CUR], boost_freqs[BOOST]);
 	igt_assert_lt(post_freqs[CUR], post_freqs[MAX]);
-
 }
 
 static void pm_rps_exit_handler(int sig)
@@ -656,6 +656,7 @@ static void pm_rps_exit_handler(int sig)
 		writeval(sysfs_files[MAX].filp, origfreqs[MAX]);
 	}
 
+	writeval(sysfs_files[BOOST].filp, origfreqs[BOOST]);
 	load_helper_deinit();
 	close(drm_fd);
 }
-- 
2.13.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t] tests/pm_rps: Move some test logic out of boost functiony

[Katarzyna Dec]

On Tue, Oct 17, 2017 at 02:43:30PM +0200, Radoslaw Szwichtenberg wrote:
> Moving code out of the boost function will allow its usage
> in other/new test scenarios.
> 
> Signed-off-by: Radoslaw Szwichtenberg <radoslaw.szwichtenberg@intel.com>
> Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
 https://lists.freedesktop.org/mailman/listinfo/intel-gfx
 Reviewed-by: Katarzyna Dec <katarzyna.dec@intel.com>

 Cheers,
 Kasia
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for tests/pm_rps: Move some test logic out of boost function

[Patchwork]

== Series Details ==

Series: tests/pm_rps: Move some test logic out of boost function
URL   : https://patchwork.freedesktop.org/series/32131/
State : success

== Summary ==

IGT patchset tested on top of latest successful build
62616c672a623b635141473133674321a4acbdc5 igt/pm_rc6_residency: Allow some leeway on the upper %% bound

with latest DRM-Tip kernel build CI_DRM_3253
920fa3252916 drm-tip: 2017y-10m-17d-09h-45m-06s UTC integration manifest

No testlist changes.

Test kms_cursor_legacy:
        Subgroup basic-busy-flip-before-cursor-legacy:
                fail       -> PASS       (fi-gdg-551) fdo#102618
        Subgroup basic-flip-after-cursor-varying-size:
                skip       -> PASS       (fi-hsw-4770r)

fdo#102618 https://bugs.freedesktop.org/show_bug.cgi?id=102618

fi-bdw-5557u     total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:441s
fi-bdw-gvtdvm    total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:451s
fi-blb-e6850     total:289  pass:223  dwarn:1   dfail:0   fail:0   skip:65  time:372s
fi-bsw-n3050     total:289  pass:243  dwarn:0   dfail:0   fail:0   skip:46  time:525s
fi-bwr-2160      total:289  pass:183  dwarn:0   dfail:0   fail:0   skip:106 time:265s
fi-bxt-dsi       total:289  pass:259  dwarn:0   dfail:0   fail:0   skip:30  time:496s
fi-bxt-j4205     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:496s
fi-byt-j1900     total:289  pass:253  dwarn:1   dfail:0   fail:0   skip:35  time:493s
fi-byt-n2820     total:289  pass:249  dwarn:1   dfail:0   fail:0   skip:39  time:480s
fi-cfl-s         total:289  pass:253  dwarn:4   dfail:0   fail:0   skip:32  time:562s
fi-elk-e7500     total:289  pass:229  dwarn:0   dfail:0   fail:0   skip:60  time:413s
fi-gdg-551       total:289  pass:178  dwarn:1   dfail:0   fail:1   skip:109 time:251s
fi-glk-1         total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:574s
fi-hsw-4770r     total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:423s
fi-ilk-650       total:289  pass:228  dwarn:0   dfail:0   fail:0   skip:61  time:437s
fi-ivb-3520m     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:492s
fi-ivb-3770      total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:461s
fi-kbl-7500u     total:289  pass:264  dwarn:1   dfail:0   fail:0   skip:24  time:492s
fi-kbl-7560u     total:289  pass:270  dwarn:0   dfail:0   fail:0   skip:19  time:571s
fi-kbl-7567u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:480s
fi-kbl-r         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:586s
fi-pnv-d510      total:289  pass:222  dwarn:1   dfail:0   fail:0   skip:66  time:544s
fi-skl-6260u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:448s
fi-skl-6700hq    total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:648s
fi-skl-6700k     total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:518s
fi-skl-6770hq    total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:494s
fi-skl-gvtdvm    total:289  pass:266  dwarn:0   dfail:0   fail:0   skip:23  time:457s
fi-snb-2520m     total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:573s
fi-snb-2600      total:289  pass:249  dwarn:0   dfail:0   fail:0   skip:40  time:426s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_370/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.IGT: success for tests/pm_rps: Move some test logic out of boost function

[Patchwork]

== Series Details ==

Series: tests/pm_rps: Move some test logic out of boost function
URL   : https://patchwork.freedesktop.org/series/32131/
State : success

== Summary ==

Test kms_cursor_legacy:
        Subgroup cursor-vs-flip-atomic-transitions:
                fail       -> PASS       (shard-hsw)

shard-hsw        total:2551 pass:1440 dwarn:0   dfail:0   fail:10  skip:1101 time:9291s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_370/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t] tests/pm_rps: Move some test logic out of boost function

[Sagar Arun Kamble]

On 10/17/2017 6:13 PM, Radoslaw Szwichtenberg wrote:
> Moving code out of the boost function will allow its usage
> in other/new test scenarios.
>
> Signed-off-by: Radoslaw Szwichtenberg <radoslaw.szwichtenberg@intel.com>
> Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
> ---
>   tests/pm_rps.c | 19 ++++++++++---------
>   1 file changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/tests/pm_rps.c b/tests/pm_rps.c
> index 89f3e31c..dad87646 100644
> --- a/tests/pm_rps.c
> +++ b/tests/pm_rps.c
> @@ -583,11 +583,6 @@ static void boost_freq(int fd, int *boost_freqs)
>   	int64_t timeout = 1;
>   	igt_spin_t *load;
>   	unsigned int engine;
> -	int fmid = (origfreqs[RPn] + origfreqs[RP0]) / 2;
> -
> -	fmid = get_hw_rounded_freq(fmid);
> -	/* Set max freq to less then boost freq */
> -	writeval(sysfs_files[MAX].filp, fmid);
>   
>   	/* Put boost on the same engine as low load */
>   	engine = I915_EXEC_RENDER;
> @@ -604,9 +599,6 @@ static void boost_freq(int fd, int *boost_freqs)
>   	igt_spin_batch_end(load);
>   	gem_sync(fd, load->handle);
>   	igt_spin_batch_free(fd, load);
> -
> -	/* Set max freq to original softmax */
> -	writeval(sysfs_files[MAX].filp, origfreqs[MAX]);
>   }
>   
>   static void waitboost(int fd, bool reset)
> @@ -615,6 +607,9 @@ static void waitboost(int fd, bool reset)
>   	int boost_freqs[NUMFREQ];
>   	int post_freqs[NUMFREQ];
>   
> +	int fmid = (origfreqs[RPn] + origfreqs[RP0]) / 2;
> +	fmid = get_hw_rounded_freq(fmid);
> +
How about function for getting mid? We can reuse in min_max_config too.
>   	load_helper_run(LOW);
>   
>   	igt_debug("Apply low load...\n");
> @@ -627,11 +622,17 @@ static void waitboost(int fd, bool reset)
>   		sleep(1);
>   	}
>   
> +	/* Set max freq to less than boost freq */
> +	writeval(sysfs_files[MAX].filp, fmid);
> +
>   	/* When we wait upon the GPU, we want to temporarily boost it
>   	 * to maximum.
>   	 */
>   	boost_freq(fd, boost_freqs);
>   
> +	/* Set max freq to original softmax */
> +	writeval(sysfs_files[MAX].filp, origfreqs[MAX]);
> +
>   	igt_debug("Apply low load again...\n");
>   	sleep(1);
>   	stabilize_check(post_freqs);
> @@ -643,7 +644,6 @@ static void waitboost(int fd, bool reset)
>   	igt_assert_lt(pre_freqs[CUR], pre_freqs[MAX]);
>   	igt_assert_eq(boost_freqs[CUR], boost_freqs[BOOST]);
>   	igt_assert_lt(post_freqs[CUR], post_freqs[MAX]);
> -
>   }
>   
>   static void pm_rps_exit_handler(int sig)
> @@ -656,6 +656,7 @@ static void pm_rps_exit_handler(int sig)
>   		writeval(sysfs_files[MAX].filp, origfreqs[MAX]);
>   	}
>   
> +	writeval(sysfs_files[BOOST].filp, origfreqs[BOOST]);
We are not changing boost_freq in current patch. Is this planned in new 
testcase?
Please defer this change until then.
>   	load_helper_deinit();
>   	close(drm_fd);
>   }

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t] tests/pm_rps: Move some test logic out of boost function

[Szwichtenberg, Radoslaw]

On Wed, 2017-10-18 at 11:10 +0530, Sagar Arun Kamble wrote:
> 
> On 10/17/2017 6:13 PM, Radoslaw Szwichtenberg wrote:
> > Moving code out of the boost function will allow its usage
> > in other/new test scenarios.
> > 
> > Signed-off-by: Radoslaw Szwichtenberg <radoslaw.szwichtenberg@intel.com>
> > Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
> > ---
> >   tests/pm_rps.c | 19 ++++++++++---------
> >   1 file changed, 10 insertions(+), 9 deletions(-)
> > 
> > diff --git a/tests/pm_rps.c b/tests/pm_rps.c
> > index 89f3e31c..dad87646 100644
> > --- a/tests/pm_rps.c
> > +++ b/tests/pm_rps.c
> > @@ -583,11 +583,6 @@ static void boost_freq(int fd, int *boost_freqs)
> >   	int64_t timeout = 1;
> >   	igt_spin_t *load;
> >   	unsigned int engine;
> > -	int fmid = (origfreqs[RPn] + origfreqs[RP0]) / 2;
> > -
> > -	fmid = get_hw_rounded_freq(fmid);
> > -	/* Set max freq to less then boost freq */
> > -	writeval(sysfs_files[MAX].filp, fmid);
> >   
> >   	/* Put boost on the same engine as low load */
> >   	engine = I915_EXEC_RENDER;
> > @@ -604,9 +599,6 @@ static void boost_freq(int fd, int *boost_freqs)
> >   	igt_spin_batch_end(load);
> >   	gem_sync(fd, load->handle);
> >   	igt_spin_batch_free(fd, load);
> > -
> > -	/* Set max freq to original softmax */
> > -	writeval(sysfs_files[MAX].filp, origfreqs[MAX]);
> >   }
> >   
> >   static void waitboost(int fd, bool reset)
> > @@ -615,6 +607,9 @@ static void waitboost(int fd, bool reset)
> >   	int boost_freqs[NUMFREQ];
> >   	int post_freqs[NUMFREQ];
> >   
> > +	int fmid = (origfreqs[RPn] + origfreqs[RP0]) / 2;
> > +	fmid = get_hw_rounded_freq(fmid);
> > +
> 
> How about function for getting mid? We can reuse in min_max_config too.
You think about something like:

static int get_fmid(void)
{
	int fmid = (origfreqs[RPn] + origfreqs[RP0]) / 2;
	return get_hw_rounded_freq(fmid);
}

Even though it wasn't scope of this change I think I can add it - do you think
it will be beneficial? We just use it two places so at this moment the benefit
will be minimal.
> >   	load_helper_run(LOW);
> >   
> >   	igt_debug("Apply low load...\n");
> > @@ -627,11 +622,17 @@ static void waitboost(int fd, bool reset)
> >   		sleep(1);
> >   	}
> >   
> > +	/* Set max freq to less than boost freq */
> > +	writeval(sysfs_files[MAX].filp, fmid);
> > +
> >   	/* When we wait upon the GPU, we want to temporarily boost it
> >   	 * to maximum.
> >   	 */
> >   	boost_freq(fd, boost_freqs);
> >   
> > +	/* Set max freq to original softmax */
> > +	writeval(sysfs_files[MAX].filp, origfreqs[MAX]);
> > +
> >   	igt_debug("Apply low load again...\n");
> >   	sleep(1);
> >   	stabilize_check(post_freqs);
> > @@ -643,7 +644,6 @@ static void waitboost(int fd, bool reset)
> >   	igt_assert_lt(pre_freqs[CUR], pre_freqs[MAX]);
> >   	igt_assert_eq(boost_freqs[CUR], boost_freqs[BOOST]);
> >   	igt_assert_lt(post_freqs[CUR], post_freqs[MAX]);
> > -
> >   }
> >   
> >   static void pm_rps_exit_handler(int sig)
> > @@ -656,6 +656,7 @@ static void pm_rps_exit_handler(int sig)
> >   		writeval(sysfs_files[MAX].filp, origfreqs[MAX]);
> >   	}
> >   
> > +	writeval(sysfs_files[BOOST].filp, origfreqs[BOOST]);
> 
> We are not changing boost_freq in current patch. Is this planned in new 
> testcase?
> Please defer this change until then.
Will remove!

Thanks for review!
Radek
> >   	load_helper_deinit();
> >   	close(drm_fd);
> >   }
> 
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t] tests/pm_rps: Move some test logic out of boost function

[Sagar Arun Kamble]

On 10/18/2017 4:33 PM, Szwichtenberg, Radoslaw wrote:
> On Wed, 2017-10-18 at 11:10 +0530, Sagar Arun Kamble wrote:
>> On 10/17/2017 6:13 PM, Radoslaw Szwichtenberg wrote:
>>> Moving code out of the boost function will allow its usage
>>> in other/new test scenarios.
>>>
>>> Signed-off-by: Radoslaw Szwichtenberg <radoslaw.szwichtenberg@intel.com>
>>> Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
>>> ---
>>>    tests/pm_rps.c | 19 ++++++++++---------
>>>    1 file changed, 10 insertions(+), 9 deletions(-)
>>>
>>> diff --git a/tests/pm_rps.c b/tests/pm_rps.c
>>> index 89f3e31c..dad87646 100644
>>> --- a/tests/pm_rps.c
>>> +++ b/tests/pm_rps.c
>>> @@ -583,11 +583,6 @@ static void boost_freq(int fd, int *boost_freqs)
>>>    	int64_t timeout = 1;
>>>    	igt_spin_t *load;
>>>    	unsigned int engine;
>>> -	int fmid = (origfreqs[RPn] + origfreqs[RP0]) / 2;
>>> -
>>> -	fmid = get_hw_rounded_freq(fmid);
>>> -	/* Set max freq to less then boost freq */
>>> -	writeval(sysfs_files[MAX].filp, fmid);
>>>    
>>>    	/* Put boost on the same engine as low load */
>>>    	engine = I915_EXEC_RENDER;
>>> @@ -604,9 +599,6 @@ static void boost_freq(int fd, int *boost_freqs)
>>>    	igt_spin_batch_end(load);
>>>    	gem_sync(fd, load->handle);
>>>    	igt_spin_batch_free(fd, load);
>>> -
>>> -	/* Set max freq to original softmax */
>>> -	writeval(sysfs_files[MAX].filp, origfreqs[MAX]);
>>>    }
>>>    
>>>    static void waitboost(int fd, bool reset)
>>> @@ -615,6 +607,9 @@ static void waitboost(int fd, bool reset)
>>>    	int boost_freqs[NUMFREQ];
>>>    	int post_freqs[NUMFREQ];
>>>    
>>> +	int fmid = (origfreqs[RPn] + origfreqs[RP0]) / 2;
>>> +	fmid = get_hw_rounded_freq(fmid);
>>> +
>> How about function for getting mid? We can reuse in min_max_config too.
> You think about something like:
>
> static int get_fmid(void)
> {
> 	int fmid = (origfreqs[RPn] + origfreqs[RP0]) / 2;
> 	return get_hw_rounded_freq(fmid);
> }
>
> Even though it wasn't scope of this change I think I can add it - do you think
> it will be beneficial? We just use it two places so at this moment the benefit
> will be minimal.
Ok. Can skip for now.
>>>    	load_helper_run(LOW);
>>>    
>>>    	igt_debug("Apply low load...\n");
>>> @@ -627,11 +622,17 @@ static void waitboost(int fd, bool reset)
>>>    		sleep(1);
>>>    	}
>>>    
>>> +	/* Set max freq to less than boost freq */
>>> +	writeval(sysfs_files[MAX].filp, fmid);
>>> +
>>>    	/* When we wait upon the GPU, we want to temporarily boost it
>>>    	 * to maximum.
>>>    	 */
>>>    	boost_freq(fd, boost_freqs);
>>>    
>>> +	/* Set max freq to original softmax */
>>> +	writeval(sysfs_files[MAX].filp, origfreqs[MAX]);
>>> +
>>>    	igt_debug("Apply low load again...\n");
>>>    	sleep(1);
>>>    	stabilize_check(post_freqs);
>>> @@ -643,7 +644,6 @@ static void waitboost(int fd, bool reset)
>>>    	igt_assert_lt(pre_freqs[CUR], pre_freqs[MAX]);
>>>    	igt_assert_eq(boost_freqs[CUR], boost_freqs[BOOST]);
>>>    	igt_assert_lt(post_freqs[CUR], post_freqs[MAX]);
>>> -
>>>    }
>>>    
>>>    static void pm_rps_exit_handler(int sig)
>>> @@ -656,6 +656,7 @@ static void pm_rps_exit_handler(int sig)
>>>    		writeval(sysfs_files[MAX].filp, origfreqs[MAX]);
>>>    	}
>>>    
>>> +	writeval(sysfs_files[BOOST].filp, origfreqs[BOOST]);
>> We are not changing boost_freq in current patch. Is this planned in new
>> testcase?
>> Please defer this change until then.
> Will remove!
>
> Thanks for review!
> Radek
>>>    	load_helper_deinit();
>>>    	close(drm_fd);
>>>    }

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v2] tests/pm_rps: Move some test logic out of boost function

[Radoslaw Szwichtenberg]

Moving code out of the boost function will allow its usage
in other/new test scenarios.

Signed-off-by: Radoslaw Szwichtenberg <radoslaw.szwichtenberg@intel.com>
---
 tests/pm_rps.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/pm_rps.c b/tests/pm_rps.c
index 89f3e31c..fa548260 100644
--- a/tests/pm_rps.c
+++ b/tests/pm_rps.c
@@ -583,11 +583,6 @@ static void boost_freq(int fd, int *boost_freqs)
 	int64_t timeout = 1;
 	igt_spin_t *load;
 	unsigned int engine;
-	int fmid = (origfreqs[RPn] + origfreqs[RP0]) / 2;
-
-	fmid = get_hw_rounded_freq(fmid);
-	/* Set max freq to less then boost freq */
-	writeval(sysfs_files[MAX].filp, fmid);
 
 	/* Put boost on the same engine as low load */
 	engine = I915_EXEC_RENDER;
@@ -604,9 +599,6 @@ static void boost_freq(int fd, int *boost_freqs)
 	igt_spin_batch_end(load);
 	gem_sync(fd, load->handle);
 	igt_spin_batch_free(fd, load);
-
-	/* Set max freq to original softmax */
-	writeval(sysfs_files[MAX].filp, origfreqs[MAX]);
 }
 
 static void waitboost(int fd, bool reset)
@@ -615,6 +607,9 @@ static void waitboost(int fd, bool reset)
 	int boost_freqs[NUMFREQ];
 	int post_freqs[NUMFREQ];
 
+	int fmid = (origfreqs[RPn] + origfreqs[RP0]) / 2;
+	fmid = get_hw_rounded_freq(fmid);
+
 	load_helper_run(LOW);
 
 	igt_debug("Apply low load...\n");
@@ -627,11 +622,17 @@ static void waitboost(int fd, bool reset)
 		sleep(1);
 	}
 
+	/* Set max freq to less than boost freq */
+	writeval(sysfs_files[MAX].filp, fmid);
+
 	/* When we wait upon the GPU, we want to temporarily boost it
 	 * to maximum.
 	 */
 	boost_freq(fd, boost_freqs);
 
+	/* Set max freq to original softmax */
+	writeval(sysfs_files[MAX].filp, origfreqs[MAX]);
+
 	igt_debug("Apply low load again...\n");
 	sleep(1);
 	stabilize_check(post_freqs);
@@ -643,7 +644,6 @@ static void waitboost(int fd, bool reset)
 	igt_assert_lt(pre_freqs[CUR], pre_freqs[MAX]);
 	igt_assert_eq(boost_freqs[CUR], boost_freqs[BOOST]);
 	igt_assert_lt(post_freqs[CUR], post_freqs[MAX]);
-
 }
 
 static void pm_rps_exit_handler(int sig)
-- 
2.13.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for tests/pm_rps: Move some test logic out of boost function (rev2)

[Patchwork]

== Series Details ==

Series: tests/pm_rps: Move some test logic out of boost function (rev2)
URL   : https://patchwork.freedesktop.org/series/32131/
State : success

== Summary ==

IGT patchset tested on top of latest successful build
9a3f6f59d4c208219f7d3178106bdef628ff68d0 tests/intel-ci: Remove fast-feedback-simulation.testlist

with latest DRM-Tip kernel build CI_DRM_3259
c4cb502ab56d drm-tip: 2017y-10m-18d-12h-48m-24s UTC integration manifest

No testlist changes.

fi-bdw-5557u     total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:447s
fi-bdw-gvtdvm    total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:457s
fi-blb-e6850     total:289  pass:223  dwarn:1   dfail:0   fail:0   skip:65  time:375s
fi-bsw-n3050     total:289  pass:243  dwarn:0   dfail:0   fail:0   skip:46  time:527s
fi-bwr-2160      total:289  pass:183  dwarn:0   dfail:0   fail:0   skip:106 time:264s
fi-bxt-dsi       total:289  pass:259  dwarn:0   dfail:0   fail:0   skip:30  time:499s
fi-bxt-j4205     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:500s
fi-byt-j1900     total:289  pass:253  dwarn:1   dfail:0   fail:0   skip:35  time:496s
fi-byt-n2820     total:289  pass:249  dwarn:1   dfail:0   fail:0   skip:39  time:482s
fi-elk-e7500     total:289  pass:229  dwarn:0   dfail:0   fail:0   skip:60  time:415s
fi-gdg-551       total:289  pass:178  dwarn:1   dfail:0   fail:1   skip:109 time:254s
fi-glk-1         total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:581s
fi-hsw-4770      total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:444s
fi-hsw-4770r     total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:421s
fi-ilk-650       total:289  pass:228  dwarn:0   dfail:0   fail:0   skip:61  time:442s
fi-ivb-3520m     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:489s
fi-ivb-3770      total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:461s
fi-kbl-7500u     total:289  pass:264  dwarn:1   dfail:0   fail:0   skip:24  time:489s
fi-kbl-7560u     total:289  pass:270  dwarn:0   dfail:0   fail:0   skip:19  time:574s
fi-kbl-7567u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:473s
fi-kbl-r         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:580s
fi-pnv-d510      total:289  pass:222  dwarn:1   dfail:0   fail:0   skip:66  time:556s
fi-skl-6260u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:450s
fi-skl-6700hq    total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:646s
fi-skl-6770hq    total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:504s
fi-skl-gvtdvm    total:289  pass:266  dwarn:0   dfail:0   fail:0   skip:23  time:455s
fi-snb-2520m     total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:566s
fi-snb-2600      total:289  pass:249  dwarn:0   dfail:0   fail:0   skip:40  time:424s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_379/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.IGT: success for tests/pm_rps: Move some test logic out of boost function (rev2)

[Patchwork]

== Series Details ==

Series: tests/pm_rps: Move some test logic out of boost function (rev2)
URL   : https://patchwork.freedesktop.org/series/32131/
State : success

== Summary ==

Test prime_self_import:
        Subgroup export-vs-gem_close-race:
                fail       -> PASS       (shard-hsw) fdo#102655
Test drv_module_reload:
        Subgroup basic-reload:
                pass       -> DMESG-WARN (shard-hsw) fdo#102707
Test kms_setmode:
        Subgroup basic:
                fail       -> PASS       (shard-hsw) fdo#99912
Test kms_flip:
        Subgroup wf_vblank-vs-modeset:
                dmesg-warn -> PASS       (shard-hsw) fdo#102614

fdo#102655 https://bugs.freedesktop.org/show_bug.cgi?id=102655
fdo#102707 https://bugs.freedesktop.org/show_bug.cgi?id=102707
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614

shard-hsw        total:2540 pass:1430 dwarn:1   dfail:0   fail:8   skip:1101 time:9266s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_379/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t v2] tests/pm_rps: Move some test logic out of boost function

[Sagar Arun Kamble]

On 10/18/2017 8:50 PM, Radoslaw Szwichtenberg wrote:
> Moving code out of the boost function will allow its usage
> in other/new test scenarios.
>
> Signed-off-by: Radoslaw Szwichtenberg <radoslaw.szwichtenberg@intel.com>
> ---
>   tests/pm_rps.c | 18 +++++++++---------
>   1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/tests/pm_rps.c b/tests/pm_rps.c
> index 89f3e31c..fa548260 100644
> --- a/tests/pm_rps.c
> +++ b/tests/pm_rps.c
> @@ -583,11 +583,6 @@ static void boost_freq(int fd, int *boost_freqs)
>   	int64_t timeout = 1;
>   	igt_spin_t *load;
>   	unsigned int engine;
> -	int fmid = (origfreqs[RPn] + origfreqs[RP0]) / 2;
> -
> -	fmid = get_hw_rounded_freq(fmid);
> -	/* Set max freq to less then boost freq */
> -	writeval(sysfs_files[MAX].filp, fmid);
>   
>   	/* Put boost on the same engine as low load */
>   	engine = I915_EXEC_RENDER;
> @@ -604,9 +599,6 @@ static void boost_freq(int fd, int *boost_freqs)
>   	igt_spin_batch_end(load);
>   	gem_sync(fd, load->handle);
>   	igt_spin_batch_free(fd, load);
> -
> -	/* Set max freq to original softmax */
> -	writeval(sysfs_files[MAX].filp, origfreqs[MAX]);
>   }
>   
>   static void waitboost(int fd, bool reset)
> @@ -615,6 +607,9 @@ static void waitboost(int fd, bool reset)
>   	int boost_freqs[NUMFREQ];
>   	int post_freqs[NUMFREQ];
This blank line needs to be removed. With that
Reviewed-by: Sagar Arun Kamble <sagar.a.kamble@intel.com>
>   
> +	int fmid = (origfreqs[RPn] + origfreqs[RP0]) / 2;
> +	fmid = get_hw_rounded_freq(fmid);
> +
>   	load_helper_run(LOW);
>   
>   	igt_debug("Apply low load...\n");
> @@ -627,11 +622,17 @@ static void waitboost(int fd, bool reset)
>   		sleep(1);
>   	}
>   
> +	/* Set max freq to less than boost freq */
> +	writeval(sysfs_files[MAX].filp, fmid);
> +
>   	/* When we wait upon the GPU, we want to temporarily boost it
>   	 * to maximum.
>   	 */
>   	boost_freq(fd, boost_freqs);
>   
> +	/* Set max freq to original softmax */
> +	writeval(sysfs_files[MAX].filp, origfreqs[MAX]);
> +
>   	igt_debug("Apply low load again...\n");
>   	sleep(1);
>   	stabilize_check(post_freqs);
> @@ -643,7 +644,6 @@ static void waitboost(int fd, bool reset)
>   	igt_assert_lt(pre_freqs[CUR], pre_freqs[MAX]);
>   	igt_assert_eq(boost_freqs[CUR], boost_freqs[BOOST]);
>   	igt_assert_lt(post_freqs[CUR], post_freqs[MAX]);
> -
>   }
>   
>   static void pm_rps_exit_handler(int sig)

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx