[2/3] tests/gem_exec_params: check the invalid flags for dual bsd ring
diff mbox

Message ID 1421110221-15634-3-git-send-email-zhipeng.gong@intel.com
State New, archived
Headers show

Commit Message

Zhipeng Gong Jan. 13, 2015, 12:50 a.m. UTC
v2: add more tests to address Daniel's comments(Zhipeng)

Signed-off-by: Zhipeng Gong <zhipeng.gong@intel.com>
---
 tests/gem_exec_params.c | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

Comments

Rodrigo Vivi Jan. 20, 2015, 9:43 p.m. UTC | #1
I couldn't save my GT3 here for new tests, but on GT2 it fails:

$ sudo ./gem_exec_params
IGT-Version: 1.9-g85bc151 (x86_64) (Linux: 3.19.0-rc4+ x86_64)
Subtest control: SUCCESS (0.000s)
Test requirement not met in function __real_main58, file gem_exec_params.c:108:
Test requirement: !gem_has_bsd(fd)
Subtest no-bsd: SKIP (0.000s)

GT2 has BSD so it shouldn't skip here

Test requirement not met in function __real_main58, file gem_exec_params.c:113:
Test requirement: !gem_has_blt(fd)
Subtest no-blt: SKIP (0.000s)

Same issue here!

Test requirement not met in function __real_main58, file gem_exec_params.c:118:
Test requirement: !gem_has_vebox(fd)
Subtest no-vebox: SKIP (0.000s)

Same issue here!

Subtest invalid-ring: SUCCESS (0.000s)
Subtest invalid-ring2: SUCCESS (0.000s)
Test requirement not met in function __real_main58, file gem_exec_params.c:133:
Test requirement: gem_has_bsd2(fd)
Subtest invalid-bsd-ring: SKIP (0.000s)

This one should be the only SKIP in my BDW GT2.

Thanks,
Rodrigo.

On Mon, Jan 12, 2015 at 4:50 PM, Zhipeng Gong <zhipeng.gong@intel.com> wrote:
> v2: add more tests to address Daniel's comments(Zhipeng)
>
> Signed-off-by: Zhipeng Gong <zhipeng.gong@intel.com>
> ---
>  tests/gem_exec_params.c | 41 +++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 41 insertions(+)
>
> diff --git a/tests/gem_exec_params.c b/tests/gem_exec_params.c
> index f63eda9..54f0dc3 100644
> --- a/tests/gem_exec_params.c
> +++ b/tests/gem_exec_params.c
> @@ -45,6 +45,9 @@
>  #include "igt_aux.h"
>
>  #define LOCAL_I915_EXEC_VEBOX (4<<0)
> +#define LOCAL_I915_EXEC_BSD_MASK (3<<13)
> +#define LOCAL_I915_EXEC_BSD_RING1 (1<<13)
> +#define LOCAL_I915_EXEC_BSD_RING2 (2<<13)
>
>  struct drm_i915_gem_execbuffer2 execbuf;
>  struct drm_i915_gem_exec_object2 gem_exec[1];
> @@ -126,6 +129,44 @@ igt_main
>                 RUN_FAIL(EINVAL);
>         }
>
> +       igt_subtest("invalid-bsd-ring") {
> +               igt_require(gem_has_bsd2(fd));
> +               execbuf.flags = I915_EXEC_BSD | LOCAL_I915_EXEC_BSD_MASK;
> +               RUN_FAIL(EINVAL);
> +       }
> +
> +       igt_subtest("invalid-bsd1-flag-on-render") {
> +               execbuf.flags = I915_EXEC_RENDER | LOCAL_I915_EXEC_BSD_RING1;
> +               RUN_FAIL(EINVAL);
> +       }
> +
> +       igt_subtest("invalid-bsd2-flag-on-render") {
> +               execbuf.flags = I915_EXEC_RENDER | LOCAL_I915_EXEC_BSD_RING2;
> +               RUN_FAIL(EINVAL);
> +       }
> +
> +       igt_subtest("invalid-bsd1-flag-on-blt") {
> +               execbuf.flags = I915_EXEC_BLT | LOCAL_I915_EXEC_BSD_RING1;
> +               RUN_FAIL(EINVAL);
> +       }
> +
> +       igt_subtest("invalid-bsd2-flag-on-blt") {
> +               execbuf.flags = I915_EXEC_BLT | LOCAL_I915_EXEC_BSD_RING2;
> +               RUN_FAIL(EINVAL);
> +       }
> +
> +       igt_subtest("invalid-bsd1-flag-on-vebox") {
> +               igt_require(gem_has_vebox(fd));
> +               execbuf.flags = LOCAL_I915_EXEC_VEBOX | LOCAL_I915_EXEC_BSD_RING1;
> +               RUN_FAIL(EINVAL);
> +       }
> +
> +       igt_subtest("invalid-bsd2-flag-on-vebox") {
> +               igt_require(gem_has_vebox(fd));
> +               execbuf.flags = LOCAL_I915_EXEC_VEBOX | LOCAL_I915_EXEC_BSD_RING2;
> +               RUN_FAIL(EINVAL);
> +       }
> +
>         igt_subtest("rel-constants-invalid-ring") {
>                 igt_require(gem_has_bsd(fd));
>                 execbuf.flags = I915_EXEC_BSD | I915_EXEC_CONSTANTS_ABSOLUTE;
> --
> 1.8.3.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Zhipeng Gong Jan. 21, 2015, 1:04 a.m. UTC | #2
> -----Original Message-----

> From: Rodrigo Vivi [mailto:rodrigo.vivi@gmail.com]

> Sent: Wednesday, January 21, 2015 5:44 AM

> To: Gong, Zhipeng

> Cc: intel-gfx; Vivi, Rodrigo

> Subject: Re: [Intel-gfx] [PATCH 2/3] tests/gem_exec_params: check the invalid

> flags for dual bsd ring

> 

> I couldn't save my GT3 here for new tests, but on GT2 it fails:

> 

> $ sudo ./gem_exec_params

> IGT-Version: 1.9-g85bc151 (x86_64) (Linux: 3.19.0-rc4+ x86_64) Subtest control:

> SUCCESS (0.000s) Test requirement not met in function __real_main58, file

> gem_exec_params.c:108:

> Test requirement: !gem_has_bsd(fd)

> Subtest no-bsd: SKIP (0.000s)

> 

> GT2 has BSD so it shouldn't skip here

no-bsd test requires that platform has no bsd ring, so it should be skipped for GT2. I don't change this test.
> 

> Test requirement not met in function __real_main58, file

> gem_exec_params.c:113:

> Test requirement: !gem_has_blt(fd)

> Subtest no-blt: SKIP (0.000s)

> 

> Same issue here!

no-blt test requires that platform has no bsd ring, so it should be skipped for GT2. I don't change this test.
> 

> Test requirement not met in function __real_main58, file

> gem_exec_params.c:118:

> Test requirement: !gem_has_vebox(fd)

> Subtest no-vebox: SKIP (0.000s)

> 

> Same issue here!

no-vebox test requires that platform has no bsd ring, so it should be skipped for GT2. I don't change this test.
> 

> Subtest invalid-ring: SUCCESS (0.000s)

> Subtest invalid-ring2: SUCCESS (0.000s)

> Test requirement not met in function __real_main58, file

> gem_exec_params.c:133:

> Test requirement: gem_has_bsd2(fd)

> Subtest invalid-bsd-ring: SKIP (0.000s)

> 

> This one should be the only SKIP in my BDW GT2.

Yes, it is skipped on GT2
> 

> Thanks,

> Rodrigo.

> 

> On Mon, Jan 12, 2015 at 4:50 PM, Zhipeng Gong <zhipeng.gong@intel.com>

> wrote:

> > v2: add more tests to address Daniel's comments(Zhipeng)

> >

> > Signed-off-by: Zhipeng Gong <zhipeng.gong@intel.com>

> > ---

> >  tests/gem_exec_params.c | 41

> > +++++++++++++++++++++++++++++++++++++++++

> >  1 file changed, 41 insertions(+)

> >

> > diff --git a/tests/gem_exec_params.c b/tests/gem_exec_params.c index

> > f63eda9..54f0dc3 100644

> > --- a/tests/gem_exec_params.c

> > +++ b/tests/gem_exec_params.c

> > @@ -45,6 +45,9 @@

> >  #include "igt_aux.h"

> >

> >  #define LOCAL_I915_EXEC_VEBOX (4<<0)

> > +#define LOCAL_I915_EXEC_BSD_MASK (3<<13) #define

> > +LOCAL_I915_EXEC_BSD_RING1 (1<<13) #define

> LOCAL_I915_EXEC_BSD_RING2

> > +(2<<13)

> >

> >  struct drm_i915_gem_execbuffer2 execbuf;  struct

> > drm_i915_gem_exec_object2 gem_exec[1]; @@ -126,6 +129,44 @@

> igt_main

> >                 RUN_FAIL(EINVAL);

> >         }

> >

> > +       igt_subtest("invalid-bsd-ring") {

> > +               igt_require(gem_has_bsd2(fd));

> > +               execbuf.flags = I915_EXEC_BSD |

> LOCAL_I915_EXEC_BSD_MASK;

> > +               RUN_FAIL(EINVAL);

> > +       }

> > +

> > +       igt_subtest("invalid-bsd1-flag-on-render") {

> > +               execbuf.flags = I915_EXEC_RENDER |

> LOCAL_I915_EXEC_BSD_RING1;

> > +               RUN_FAIL(EINVAL);

> > +       }

> > +

> > +       igt_subtest("invalid-bsd2-flag-on-render") {

> > +               execbuf.flags = I915_EXEC_RENDER |

> LOCAL_I915_EXEC_BSD_RING2;

> > +               RUN_FAIL(EINVAL);

> > +       }

> > +

> > +       igt_subtest("invalid-bsd1-flag-on-blt") {

> > +               execbuf.flags = I915_EXEC_BLT |

> LOCAL_I915_EXEC_BSD_RING1;

> > +               RUN_FAIL(EINVAL);

> > +       }

> > +

> > +       igt_subtest("invalid-bsd2-flag-on-blt") {

> > +               execbuf.flags = I915_EXEC_BLT |

> LOCAL_I915_EXEC_BSD_RING2;

> > +               RUN_FAIL(EINVAL);

> > +       }

> > +

> > +       igt_subtest("invalid-bsd1-flag-on-vebox") {

> > +               igt_require(gem_has_vebox(fd));

> > +               execbuf.flags = LOCAL_I915_EXEC_VEBOX |

> LOCAL_I915_EXEC_BSD_RING1;

> > +               RUN_FAIL(EINVAL);

> > +       }

> > +

> > +       igt_subtest("invalid-bsd2-flag-on-vebox") {

> > +               igt_require(gem_has_vebox(fd));

> > +               execbuf.flags = LOCAL_I915_EXEC_VEBOX |

> LOCAL_I915_EXEC_BSD_RING2;

> > +               RUN_FAIL(EINVAL);

> > +       }

> > +

> >         igt_subtest("rel-constants-invalid-ring") {

> >                 igt_require(gem_has_bsd(fd));

> >                 execbuf.flags = I915_EXEC_BSD |

> > I915_EXEC_CONSTANTS_ABSOLUTE;

> > --

> > 1.8.3.1

> >

> > _______________________________________________

> > Intel-gfx mailing list

> > Intel-gfx@lists.freedesktop.org

> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx

> 

> 

> 

> --

> Rodrigo Vivi

> Blog: http://blog.vivi.eng.br

Patch
diff mbox

diff --git a/tests/gem_exec_params.c b/tests/gem_exec_params.c
index f63eda9..54f0dc3 100644
--- a/tests/gem_exec_params.c
+++ b/tests/gem_exec_params.c
@@ -45,6 +45,9 @@ 
 #include "igt_aux.h"
 
 #define LOCAL_I915_EXEC_VEBOX (4<<0)
+#define LOCAL_I915_EXEC_BSD_MASK (3<<13)
+#define LOCAL_I915_EXEC_BSD_RING1 (1<<13)
+#define LOCAL_I915_EXEC_BSD_RING2 (2<<13)
 
 struct drm_i915_gem_execbuffer2 execbuf;
 struct drm_i915_gem_exec_object2 gem_exec[1];
@@ -126,6 +129,44 @@  igt_main
 		RUN_FAIL(EINVAL);
 	}
 
+	igt_subtest("invalid-bsd-ring") {
+		igt_require(gem_has_bsd2(fd));
+		execbuf.flags = I915_EXEC_BSD | LOCAL_I915_EXEC_BSD_MASK;
+		RUN_FAIL(EINVAL);
+	}
+
+	igt_subtest("invalid-bsd1-flag-on-render") {
+		execbuf.flags = I915_EXEC_RENDER | LOCAL_I915_EXEC_BSD_RING1;
+		RUN_FAIL(EINVAL);
+	}
+
+	igt_subtest("invalid-bsd2-flag-on-render") {
+		execbuf.flags = I915_EXEC_RENDER | LOCAL_I915_EXEC_BSD_RING2;
+		RUN_FAIL(EINVAL);
+	}
+
+	igt_subtest("invalid-bsd1-flag-on-blt") {
+		execbuf.flags = I915_EXEC_BLT | LOCAL_I915_EXEC_BSD_RING1;
+		RUN_FAIL(EINVAL);
+	}
+
+	igt_subtest("invalid-bsd2-flag-on-blt") {
+		execbuf.flags = I915_EXEC_BLT | LOCAL_I915_EXEC_BSD_RING2;
+		RUN_FAIL(EINVAL);
+	}
+
+	igt_subtest("invalid-bsd1-flag-on-vebox") {
+		igt_require(gem_has_vebox(fd));
+		execbuf.flags = LOCAL_I915_EXEC_VEBOX | LOCAL_I915_EXEC_BSD_RING1;
+		RUN_FAIL(EINVAL);
+	}
+
+	igt_subtest("invalid-bsd2-flag-on-vebox") {
+		igt_require(gem_has_vebox(fd));
+		execbuf.flags = LOCAL_I915_EXEC_VEBOX | LOCAL_I915_EXEC_BSD_RING2;
+		RUN_FAIL(EINVAL);
+	}
+
 	igt_subtest("rel-constants-invalid-ring") {
 		igt_require(gem_has_bsd(fd));
 		execbuf.flags = I915_EXEC_BSD | I915_EXEC_CONSTANTS_ABSOLUTE;