tests/core_getparams: Create new test core_getparams

From: Jeff McGee <[email protected]>

tests/core_getparams needs the new libdrm interfaces for querying subslice and EU counts.

For: VIZ-4636

Signed-off-by Jeff McGee <[email protected]>

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

configure.ac +0 -0

index 16d6a2e..88a1c3d 100644

configure.ac +0 -0

 PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
 PKG_CHECK_MODULES(OVERLAY_XVLIB, [xv x11 xext dri2proto >= 2.6], enable_overlay_xvlib=yes, enable_overlay_xvlib=no)
 PKG_CHECK_MODULES(OVERLAY_XLIB, [cairo-xlib dri2proto >= 2.6], enable_overlay_xlib=yes, enable_overlay_xlib=no)

Signature · 6 lines

2.3.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Quoted 19 lines · On Mon, Mar 09, 2015 at 04:41:02PM -0700, [email protected] wrote:

From: Jeff McGee <[email protected]>

tests/core_getparams needs the new libdrm interfaces for querying subslice and EU counts.

For: VIZ-4636

Signed-off-by Jeff McGee <[email protected]>

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

configure.ac +0 -0

index 16d6a2e..88a1c3d 100644
@@ -82,7 +82,7 @@ if test "x$GCC" = "xyes"; then
 fi
 AC_SUBST(ASSEMBLER_WARN_CFLAGS)
 

configure.ac if test "x$GCC" = "xyes"; then · line 85

Quoted 2 lines

configure.ac +1 -1

-PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.52 libdrm])
+PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.60 libdrm])

Please don't and instead copypaste the new structs/defines with a local_ prefix like we do it for all the other new igt testcases. Forcing libdrm to get updated for igt all the time can get annoying fast. -Daniel

Quoted 6 lines

configure.ac +0 -0

 PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
 PKG_CHECK_MODULES(OVERLAY_XVLIB, [xv x11 xext dri2proto >= 2.6], enable_overlay_xvlib=yes, enable_overlay_xvlib=no)
 PKG_CHECK_MODULES(OVERLAY_XLIB, [cairo-xlib dri2proto >= 2.6], enable_overlay_xlib=yes, enable_overlay_xlib=no)

Signature · 1 line

2.3.0

Quoted 4 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 7 lines

Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Beignet mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/beignet

Quoted 20 lines · Daniel Vetter

Quoted 19 lines · On Mon, Mar 09, 2015 at 04:41:02PM -0700, [email protected] wrote:

From: Jeff McGee <[email protected]>

tests/core_getparams needs the new libdrm interfaces for querying subslice and EU counts.

For: VIZ-4636

Signed-off-by Jeff McGee <[email protected]>

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

configure.ac +0 -0

index 16d6a2e..88a1c3d 100644
@@ -82,7 +82,7 @@ if test "x$GCC" = "xyes"; then
 fi
 AC_SUBST(ASSEMBLER_WARN_CFLAGS)
 

Quoted 8 lines

configure.ac if test "x$GCC" = "xyes"; then · line 85

Quoted 2 lines

configure.ac +1 -1

-PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.52 libdrm])
+PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.60 libdrm])

Please don't and instead copypaste the new structs/defines with a local_ prefix like we do it for all the other new igt testcases. Forcing libdrm to get updated for igt all the time can get annoying fast. -Daniel

In this case I'm trying to exercise new API functions in libdrm which wrap the GETPARAM ioctl. Would you rather me bypass the wrapper to avoid requiring updated libdrm? I can do that, but it fails to test the complete path that client would use.

-Jeff

Quoted 11 lines

Quoted 10 lines

configure.ac +0 -1

 PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
 PKG_CHECK_MODULES(OVERLAY_XVLIB, [xv x11 xext dri2proto >= 2.6], enable_overlay_xvlib=yes, enable_overlay_xvlib=no)
 PKG_CHECK_MODULES(OVERLAY_XLIB, [cairo-xlib dri2proto >= 2.6], enable_overlay_xlib=yes, enable_overlay_xlib=no)
--

2.3.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Quoted 8 lines

--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Beignet mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/beignet

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Quoted 29 lines · Jeff McGee

Quoted 20 lines · Daniel Vetter

Quoted 19 lines · On Mon, Mar 09, 2015 at 04:41:02PM -0700, [email protected] wrote:

From: Jeff McGee <[email protected]>

tests/core_getparams needs the new libdrm interfaces for querying subslice and EU counts.

For: VIZ-4636

Signed-off-by Jeff McGee <[email protected]>

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

configure.ac +0 -0

index 16d6a2e..88a1c3d 100644
@@ -82,7 +82,7 @@ if test "x$GCC" = "xyes"; then
 fi
 AC_SUBST(ASSEMBLER_WARN_CFLAGS)
 

Quoted 8 lines

configure.ac if test "x$GCC" = "xyes"; then · line 85

Quoted 2 lines

configure.ac +1 -1

-PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.52 libdrm])
+PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.60 libdrm])

Please don't and instead copypaste the new structs/defines with a local_ prefix like we do it for all the other new igt testcases. Forcing libdrm to get updated for igt all the time can get annoying fast. -Daniel

Quoted 4 lines

In this case I'm trying to exercise new API functions in libdrm which wrap the GETPARAM ioctl. Would you rather me bypass the wrapper to avoid requiring updated libdrm? I can do that, but it fails to test the complete path that client would use.

Am I missing something, or does 2.4.60 not exist yet?

That said dependency bumps for igt seem like less of an issue than dependency bumps for mesa.. I mean if you are using igt you are probably on the latest anyways.. I'm not sure why Daniel is so concerned about that..

(but dependency bumps to something that doesn't exist yet should perhaps be avoided)

BR,
-R

Quoted 22 lines

-Jeff

Quoted 19 lines

Quoted 10 lines

configure.ac +0 -1

 PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
 PKG_CHECK_MODULES(OVERLAY_XVLIB, [xv x11 xext dri2proto >= 2.6], enable_overlay_xvlib=yes, enable_overlay_xvlib=no)
 PKG_CHECK_MODULES(OVERLAY_XLIB, [cairo-xlib dri2proto >= 2.6], enable_overlay_xlib=yes, enable_overlay_xlib=no)
--

2.3.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Beignet mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/beignet

Quoted 4 lines

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Quoted 43 lines · Rob Clark

Quoted 29 lines · Jeff McGee

Quoted 20 lines · Daniel Vetter

Quoted 19 lines · On Mon, Mar 09, 2015 at 04:41:02PM -0700, [email protected] wrote:

From: Jeff McGee <[email protected]>

tests/core_getparams needs the new libdrm interfaces for querying subslice and EU counts.

For: VIZ-4636

Signed-off-by Jeff McGee <[email protected]>

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

configure.ac +0 -0

index 16d6a2e..88a1c3d 100644
@@ -82,7 +82,7 @@ if test "x$GCC" = "xyes"; then
 fi
 AC_SUBST(ASSEMBLER_WARN_CFLAGS)
 

Quoted 8 lines

configure.ac if test "x$GCC" = "xyes"; then · line 85

Quoted 2 lines

configure.ac +1 -1

-PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.52 libdrm])
+PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.60 libdrm])

Please don't and instead copypaste the new structs/defines with a local_ prefix like we do it for all the other new igt testcases. Forcing libdrm to get updated for igt all the time can get annoying fast. -Daniel

Quoted 4 lines

In this case I'm trying to exercise new API functions in libdrm which wrap the GETPARAM ioctl. Would you rather me bypass the wrapper to avoid requiring updated libdrm? I can do that, but it fails to test the complete path that client would use.

Am I missing something, or does 2.4.60 not exist yet?

That said dependency bumps for igt seem like less of an issue than dependency bumps for mesa.. I mean if you are using igt you are probably on the latest anyways.. I'm not sure why Daniel is so concerned about that..

Quoted 6 lines

(but dependency bumps to something that doesn't exist yet should perhaps be avoided)

BR,
-R

Hi Rob. This igt change is contigent upon my libdrm changes which would in fact bump that version to 2.4.60 after adding an API. That change is also posted and waiting review. I guess I should have stated that dependency here to begin with.

http://lists.freedesktop.org/archives/intel-gfx/2015-March/061101.html

Jeff

Quoted 30 lines

Quoted 22 lines

-Jeff

Quoted 11 lines

Quoted 10 lines

configure.ac +0 -1

 PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
 PKG_CHECK_MODULES(OVERLAY_XVLIB, [xv x11 xext dri2proto >= 2.6], enable_overlay_xvlib=yes, enable_overlay_xvlib=no)
 PKG_CHECK_MODULES(OVERLAY_XLIB, [cairo-xlib dri2proto >= 2.6], enable_overlay_xlib=yes, enable_overlay_xlib=no)
--

2.3.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Quoted 8 lines

--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Beignet mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/beignet

Quoted 4 lines

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Quoted 29 lines · Jeff McGee

Quoted 20 lines · Daniel Vetter

Quoted 19 lines · On Mon, Mar 09, 2015 at 04:41:02PM -0700, [email protected] wrote:

From: Jeff McGee <[email protected]>

tests/core_getparams needs the new libdrm interfaces for querying subslice and EU counts.

For: VIZ-4636

Signed-off-by Jeff McGee <[email protected]>

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

configure.ac +0 -0

index 16d6a2e..88a1c3d 100644
@@ -82,7 +82,7 @@ if test "x$GCC" = "xyes"; then
 fi
 AC_SUBST(ASSEMBLER_WARN_CFLAGS)
 

Quoted 8 lines

configure.ac if test "x$GCC" = "xyes"; then · line 85

Quoted 2 lines

configure.ac +1 -1

-PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.52 libdrm])
+PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.60 libdrm])

Please don't and instead copypaste the new structs/defines with a local_ prefix like we do it for all the other new igt testcases. Forcing libdrm to get updated for igt all the time can get annoying fast. -Daniel

Quoted 4 lines

In this case I'm trying to exercise new API functions in libdrm which wrap the GETPARAM ioctl. Would you rather me bypass the wrapper to avoid requiring updated libdrm? I can do that, but it fails to test the complete path that client would use.

Am I missing something, or does 2.4.60 not exist yet?

That said dependency bumps for igt seem like less of an issue than dependency bumps for mesa.. I mean if you are using igt you are probably on the latest anyways.. I'm not sure why Daniel is so concerned about that..

(but dependency bumps to something that doesn't exist yet should perhaps be avoided)

Quoted 38 lines · Rob Clark

Quoted 29 lines · Jeff McGee

Quoted 20 lines · Daniel Vetter

Quoted 19 lines · On Mon, Mar 09, 2015 at 04:41:02PM -0700, [email protected] wrote:

From: Jeff McGee <[email protected]>

tests/core_getparams needs the new libdrm interfaces for querying subslice and EU counts.

For: VIZ-4636

Signed-off-by Jeff McGee <[email protected]>

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

configure.ac +0 -0

index 16d6a2e..88a1c3d 100644
@@ -82,7 +82,7 @@ if test "x$GCC" = "xyes"; then
 fi
 AC_SUBST(ASSEMBLER_WARN_CFLAGS)
 

Quoted 8 lines

configure.ac if test "x$GCC" = "xyes"; then · line 85

Quoted 2 lines

configure.ac +1 -1

-PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.52 libdrm])
+PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.60 libdrm])

Please don't and instead copypaste the new structs/defines with a local_ prefix like we do it for all the other new igt testcases. Forcing libdrm to get updated for igt all the time can get annoying fast. -Daniel

Quoted 4 lines

In this case I'm trying to exercise new API functions in libdrm which wrap the GETPARAM ioctl. Would you rather me bypass the wrapper to avoid requiring updated libdrm? I can do that, but it fails to test the complete path that client would use.

Am I missing something, or does 2.4.60 not exist yet?

Quoted 7 lines

That said dependency bumps for igt seem like less of an issue than dependency bumps for mesa.. I mean if you are using igt you are probably on the latest anyways.. I'm not sure why Daniel is so concerned about that..

(but dependency bumps to something that doesn't exist yet should perhaps be avoided)

I'd like to avoid massive depency loops for igt tests so that I can merge the testcase right when the patches land in -nightly. Otherwise there's always a small delay involved where regression can creep in. Also if I have to update libdrm every time I update igt that's annoying since without that I don't have to install/update anything at all - I run igt in-place. And we've used the LOCAL_ prefixes for pretty much every abi addition in igt tests thus far.
-Daniel

Quoted 47 lines · Daniel Vetter

Quoted 38 lines · Rob Clark

Quoted 29 lines · Jeff McGee

Quoted 20 lines · Daniel Vetter

Quoted 19 lines · On Mon, Mar 09, 2015 at 04:41:02PM -0700, [email protected] wrote:

From: Jeff McGee <[email protected]>

tests/core_getparams needs the new libdrm interfaces for querying subslice and EU counts.

For: VIZ-4636

Signed-off-by Jeff McGee <[email protected]>

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

configure.ac +0 -0

index 16d6a2e..88a1c3d 100644
@@ -82,7 +82,7 @@ if test "x$GCC" = "xyes"; then
 fi
 AC_SUBST(ASSEMBLER_WARN_CFLAGS)
 

Quoted 8 lines

configure.ac if test "x$GCC" = "xyes"; then · line 85

Quoted 2 lines

configure.ac +1 -1

-PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.52 libdrm])
+PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.60 libdrm])

Please don't and instead copypaste the new structs/defines with a local_ prefix like we do it for all the other new igt testcases. Forcing libdrm to get updated for igt all the time can get annoying fast. -Daniel

Quoted 4 lines

In this case I'm trying to exercise new API functions in libdrm which wrap the GETPARAM ioctl. Would you rather me bypass the wrapper to avoid requiring updated libdrm? I can do that, but it fails to test the complete path that client would use.

Am I missing something, or does 2.4.60 not exist yet?

Quoted 7 lines

That said dependency bumps for igt seem like less of an issue than dependency bumps for mesa.. I mean if you are using igt you are probably on the latest anyways.. I'm not sure why Daniel is so concerned about that..

(but dependency bumps to something that doesn't exist yet should perhaps be avoided)

Quoted 8 lines

I'd like to avoid massive depency loops for igt tests so that I can merge the testcase right when the patches land in -nightly. Otherwise there's always a small delay involved where regression can creep in. Also if I have to update libdrm every time I update igt that's annoying since without that I don't have to install/update anything at all - I run igt in-place. And we've used the LOCAL_ prefixes for pretty much every abi addition in igt tests thus far.
-Daniel

I understand that and it certainly makes sense when libdrm is only providing defines or structs. But as I said, in this case there is code in libdrm (the wrapper) that we could test as part of the complete path. Are you recommending that I implement duplicate wrapper functions in igt with the local prefix?

Quoted 57 lines · Jeff McGee

Quoted 47 lines · Daniel Vetter

Quoted 38 lines · Rob Clark

Quoted 29 lines · Jeff McGee

Quoted 20 lines · Daniel Vetter

Quoted 19 lines · On Mon, Mar 09, 2015 at 04:41:02PM -0700, [email protected] wrote:

From: Jeff McGee <[email protected]>

tests/core_getparams needs the new libdrm interfaces for querying subslice and EU counts.

For: VIZ-4636

Signed-off-by Jeff McGee <[email protected]>

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

configure.ac +0 -0

index 16d6a2e..88a1c3d 100644
@@ -82,7 +82,7 @@ if test "x$GCC" = "xyes"; then
 fi
 AC_SUBST(ASSEMBLER_WARN_CFLAGS)
 

Quoted 8 lines

configure.ac if test "x$GCC" = "xyes"; then · line 85

Quoted 2 lines

configure.ac +1 -1

-PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.52 libdrm])
+PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.60 libdrm])

Please don't and instead copypaste the new structs/defines with a local_ prefix like we do it for all the other new igt testcases. Forcing libdrm to get updated for igt all the time can get annoying fast. -Daniel

Quoted 4 lines

In this case I'm trying to exercise new API functions in libdrm which wrap the GETPARAM ioctl. Would you rather me bypass the wrapper to avoid requiring updated libdrm? I can do that, but it fails to test the complete path that client would use.

Am I missing something, or does 2.4.60 not exist yet?

Quoted 7 lines

That said dependency bumps for igt seem like less of an issue than dependency bumps for mesa.. I mean if you are using igt you are probably on the latest anyways.. I'm not sure why Daniel is so concerned about that..

(but dependency bumps to something that doesn't exist yet should perhaps be avoided)

Quoted 8 lines

I'd like to avoid massive depency loops for igt tests so that I can merge the testcase right when the patches land in -nightly. Otherwise there's always a small delay involved where regression can creep in. Also if I have to update libdrm every time I update igt that's annoying since without that I don't have to install/update anything at all - I run igt in-place. And we've used the LOCAL_ prefixes for pretty much every abi addition in igt tests thus far.
-Daniel

Quoted 5 lines

I understand that and it certainly makes sense when libdrm is only providing defines or structs. But as I said, in this case there is code in libdrm (the wrapper) that we could test as part of the complete path. Are you recommending that I implement duplicate wrapper functions in igt with the local prefix?

Sorry I totally didn't realize that. Generally we don't have a lot of igt testcase for libdrm really, imo it's usually simpler to just add the interface to each part. Since this is such a simple one there's no need to have a low-level test and the libdrm test on top, but that's what I'd do if there's something worth testing in libdrm. Because for complex functionality I really want to get the bare-metal tests in together with the kernel part. Stalling for libdrm release could take longer.

And yes, personally I'd just have open-coded the getparam call here in igt, but that's just a bikeshed.
-Daniel

From: Jeff McGee <[email protected]>

New test core_getparams consists of 2 subtests, each one testing the ability of userspace to query the correct value of a GT config
attribute: subslice total or EU total. drm/i915 implementation of these queries is required for Cherryview and Gen9+ devices (non- simulated).

v2: Duplicate small amount of new libdrm functionality to avoid
bumping libdrm version requirement (Daniel). Convert some igt_asserts to the appropriate comparison variants. Add a test description.
v3: Actually use the LOCAL GETPARAM defines. Otherwise can't build
against older libdrm as intended by v2.

For: VIZ-4636

Signed-off-by Jeff McGee <[email protected]>

---
 tests/.gitignore       |   1 +
 tests/Makefile.sources |   1 +
 tests/core_getparams.c | 167 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 169 insertions(+)
 create mode 100644 tests/core_getparams.c

tests/.gitignore +1 -0

index 426cc67..c742308 100644
@@ -1,6 +1,7 @@
 # Please keep sorted alphabetically
 core_get_client_auth
 core_getclient
+core_getparams
 core_getstats
 core_getversion
 drm_import_export

tests/Makefile.sources +0 -0

index 51e8376..999c8f8 100644

tests/Makefile.sources +0 -0

 	drv_suspend \
 	drv_hangman \
 	gem_bad_reloc \

tests/core_getparams.c new file +167 -0

new file mode 100644
index 0000000..2855d06
@@ -0,0 +1,167 @@
+/*
+ * Copyright © 2014 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Jeff McGee <[email protected]>
+ *
+ */
+
+#include <unistd.h>
+#include <errno.h>
+#include <xf86drm.h>
+#include <i915_drm.h>
+#include "drmtest.h"
+#include "intel_chipset.h"
+#include "intel_bufmgr.h"
+
+IGT_TEST_DESCRIPTION("Tests the export of parameters via DRM_IOCTL_I915_GETPARAM\n");
+
+int drm_fd;
+int devid;
+
+static void
+init(void)
+{
+	drm_fd = drm_open_any();
+	devid = intel_get_drm_devid(drm_fd);
+}
+
+static void
+deinit(void)
+{
+	close(drm_fd);
+}
+
+#define LOCAL_I915_PARAM_SUBSLICE_TOTAL	33
+#define LOCAL_I915_PARAM_EU_TOTAL	34
+
+static int
+getparam(int param, int *value)
+{
+	drm_i915_getparam_t gp;
+	int ret;
+
+	memset(&gp, 0, sizeof(gp));
+	gp.value = value;
+	gp.param = param;
+	ret = drmIoctl(drm_fd, DRM_IOCTL_I915_GETPARAM, &gp);
+	if (ret)
+		return -errno;
+
+	return 0;
+}
+
+static void
+subslice_total(void)
+{
+	unsigned int subslice_total = 0;
+	int ret;
+
+	ret = getparam(LOCAL_I915_PARAM_SUBSLICE_TOTAL, (int*)&subslice_total);
+
+	if (ret) {
+		/*
+		 * These devices are not required to implement the
+		 * interface. If they do not, -ENODEV must be returned.
+		*/
+		if ((intel_gen(devid) < 8) ||
+		    IS_BROADWELL(devid) ||
+		    igt_run_in_simulation()) {
+			igt_assert_eq(ret, -ENODEV);
+			igt_info("subslice total: unknown\n");
+		/*
+		 * All other devices must implement the interface, so
+		 * fail them if we are here.
+		*/
+		} else {
+			igt_assert_neq(ret, EINVAL); /* request not recognized? */
+			igt_assert_neq(ret, ENODEV); /* device not supported? */
+			igt_assert_eq(ret, 0); /* other error? */
+		}
+	} else {
+		/*
+		 * On success, just make sure the returned count value is
+		 * non-zero. The validity of the count value for the given
+		 * device is not checked.
+		*/
+		igt_assert_neq(subslice_total, 0);
+		igt_info("subslice total: %u\n", subslice_total);
+	}
+}
+
+static void
+eu_total(void)
+{
+	unsigned int eu_total = 0;
+	int ret;
+
+	ret = getparam(LOCAL_I915_PARAM_EU_TOTAL, (int*)&eu_total);
+
+	if (ret) {
+		/*
+		 * These devices are not required to implement the
+		 * interface. If they do not, -ENODEV must be returned.
+		*/
+		if ((intel_gen(devid) < 8) ||
+		    IS_BROADWELL(devid) ||
+		    igt_run_in_simulation()) {
+			igt_assert_eq(ret, -ENODEV);
+			igt_info("EU total: unknown\n");
+		/*
+		 * All other devices must implement the interface, so
+		 * fail them if we are here.
+		*/
+		} else {
+			igt_assert_neq(ret, EINVAL); /* request not recognized? */
+			igt_assert_neq(ret, ENODEV); /* device not supported? */
+			igt_assert_eq(ret, 0); /* other error? */
+		}
+	} else {
+		/*
+		 * On success, just make sure the returned count value is
+		 * non-zero. The validity of the count value for the given
+		 * device is not checked.
+		*/
+		igt_assert_neq(eu_total, 0);
+		igt_info("EU total: %u\n", eu_total);
+	}
+}
+
+static void
+exit_handler(int sig)
+{
+	deinit();
+}
+
+igt_main
+{
+	igt_fixture {
+		igt_install_exit_handler(exit_handler);
+		init();
+	}
+
+	igt_subtest("subslice-total")
+		subslice_total();
+
+	igt_subtest("eu-total")
+		eu_total();
+}

Signature · 6 lines

2.3.0

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

From: Jeff McGee <[email protected]>

New test core_getparams consists of 2 subtests, each one testing the ability of userspace to query the correct value of a GT config
attribute: subslice total or EU total. drm/i915 implementation of these queries is required for Cherryview and Gen9+ devices (non- simulated).

v2: Duplicate small amount of new libdrm functionality to avoid
bumping libdrm version requirement (Daniel). Convert some igt_asserts to the appropriate comparison variants. Add a test description.
v3: Actually use the LOCAL GETPARAM defines. Otherwise can't build
against older libdrm as intended by v2.

For: VIZ-4636

Signed-off-by Jeff McGee <[email protected]>

---
 tests/.gitignore       |   1 +
 tests/Makefile.sources |   1 +
 tests/core_getparams.c | 167 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 169 insertions(+)
 create mode 100644 tests/core_getparams.c

tests/.gitignore +1 -0

index 426cc67..c742308 100644
@@ -1,6 +1,7 @@
 # Please keep sorted alphabetically
 core_get_client_auth
 core_getclient
+core_getparams
 core_getstats
 core_getversion
 drm_import_export

tests/Makefile.sources +1 -0

index 51e8376..999c8f8 100644
@@ -15,6 +15,7 @@ NOUVEAU_TESTS_M = \
 
 TESTS_progs_M = \
 	core_get_client_auth \
+	core_getparams \
 	drv_suspend \
 	drv_hangman \
 	gem_bad_reloc \

tests/core_getparams.c new file +167 -0

new file mode 100644
index 0000000..2855d06
@@ -0,0 +1,167 @@
+/*
+ * Copyright © 2014 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Jeff McGee <[email protected]>
+ *
+ */
+
+#include <unistd.h>
+#include <errno.h>
+#include <xf86drm.h>
+#include <i915_drm.h>
+#include "drmtest.h"
+#include "intel_chipset.h"
+#include "intel_bufmgr.h"
+
+IGT_TEST_DESCRIPTION("Tests the export of parameters via DRM_IOCTL_I915_GETPARAM\n");
+
+int drm_fd;
+int devid;
+
+static void
+init(void)
+{
+	drm_fd = drm_open_any();
+	devid = intel_get_drm_devid(drm_fd);
+}
+
+static void
+deinit(void)
+{
+	close(drm_fd);
+}
+
+#define LOCAL_I915_PARAM_SUBSLICE_TOTAL	33
+#define LOCAL_I915_PARAM_EU_TOTAL	34
+
+static int
+getparam(int param, int *value)
+{
+	drm_i915_getparam_t gp;
+	int ret;
+
+	memset(&gp, 0, sizeof(gp));
+	gp.value = value;
+	gp.param = param;
+	ret = drmIoctl(drm_fd, DRM_IOCTL_I915_GETPARAM, &gp);
+	if (ret)
+		return -errno;
+
+	return 0;
+}
+
+static void
+subslice_total(void)
+{
+	unsigned int subslice_total = 0;
+	int ret;
+
+	ret = getparam(LOCAL_I915_PARAM_SUBSLICE_TOTAL, (int*)&subslice_total);
+
+	if (ret) {
+		/*
+		 * These devices are not required to implement the
+		 * interface. If they do not, -ENODEV must be returned.
+		*/
+		if ((intel_gen(devid) < 8) ||
+		    IS_BROADWELL(devid) ||
+		    igt_run_in_simulation()) {
+			igt_assert_eq(ret, -ENODEV);
+			igt_info("subslice total: unknown\n");
+		/*
+		 * All other devices must implement the interface, so
+		 * fail them if we are here.
+		*/
+		} else {
+			igt_assert_neq(ret, EINVAL); /* request not recognized? */
+			igt_assert_neq(ret, ENODEV); /* device not supported? */
+			igt_assert_eq(ret, 0); /* other error? */
+		}
+	} else {
+		/*
+		 * On success, just make sure the returned count value is
+		 * non-zero. The validity of the count value for the given
+		 * device is not checked.
+		*/
+		igt_assert_neq(subslice_total, 0);
+		igt_info("subslice total: %u\n", subslice_total);
+	}
+}
+
+static void
+eu_total(void)
+{
+	unsigned int eu_total = 0;
+	int ret;
+
+	ret = getparam(LOCAL_I915_PARAM_EU_TOTAL, (int*)&eu_total);
+
+	if (ret) {
+		/*
+		 * These devices are not required to implement the
+		 * interface. If they do not, -ENODEV must be returned.
+		*/
+		if ((intel_gen(devid) < 8) ||
+		    IS_BROADWELL(devid) ||
+		    igt_run_in_simulation()) {
+			igt_assert_eq(ret, -ENODEV);
+			igt_info("EU total: unknown\n");
+		/*
+		 * All other devices must implement the interface, so
+		 * fail them if we are here.
+		*/
+		} else {
+			igt_assert_neq(ret, EINVAL); /* request not recognized? */
+			igt_assert_neq(ret, ENODEV); /* device not supported? */
+			igt_assert_eq(ret, 0); /* other error? */
+		}
+	} else {
+		/*
+		 * On success, just make sure the returned count value is
+		 * non-zero. The validity of the count value for the given
+		 * device is not checked.
+		*/
+		igt_assert_neq(eu_total, 0);
+		igt_info("EU total: %u\n", eu_total);
+	}
+}
+
+static void
+exit_handler(int sig)
+{
+	deinit();
+}
+
+igt_main
+{
+	igt_fixture {
+		igt_install_exit_handler(exit_handler);
+		init();
+	}
+
+	igt_subtest("subslice-total")
+		subslice_total();
+
+	igt_subtest("eu-total")
+		eu_total();
+}

Signature · 6 lines

2.3.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

My only concern is about the following macros:

tests/core_getparams.c line 55

Quoted 2 lines

tests/core_getparams.c new file +2 -0

+#define LOCAL_I915_PARAM_SUBSLICE_TOTAL      33
+#define LOCAL_I915_PARAM_EU_TOTAL    34

How about to just use the definitons in the kernel header file? For an example:

  #include <drm/i915_drm.h>

  #ifdef LOCAL_I915_PARAM_SUBSLICE_TOTAL
  //Put all the code into this block.
  #endif

Then we can avoid put the same definitions in different files, and we can avoid unecessary testing on an old kernel which doesn't have this kernel interface.

For all the other part, it LGTM.

Reviewed-by Zhigang Gong <[email protected]>

Thanks,
Zhigang Gong.

Quoted 228 lines · On Thu, Mar 12, 2015 at 05:26:25PM -0700, [email protected] wrote:

From: Jeff McGee <[email protected]>

New test core_getparams consists of 2 subtests, each one testing the ability of userspace to query the correct value of a GT config
attribute: subslice total or EU total. drm/i915 implementation of these queries is required for Cherryview and Gen9+ devices (non- simulated).

v2: Duplicate small amount of new libdrm functionality to avoid
bumping libdrm version requirement (Daniel). Convert some igt_asserts to the appropriate comparison variants. Add a test description.
v3: Actually use the LOCAL GETPARAM defines. Otherwise can't build
against older libdrm as intended by v2.

For: VIZ-4636

Signed-off-by Jeff McGee <[email protected]>

---
 tests/.gitignore       |   1 +
 tests/Makefile.sources |   1 +
 tests/core_getparams.c | 167 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 169 insertions(+)
 create mode 100644 tests/core_getparams.c

tests/.gitignore +1 -0

index 426cc67..c742308 100644
@@ -1,6 +1,7 @@
 # Please keep sorted alphabetically
 core_get_client_auth
 core_getclient
+core_getparams
 core_getstats
 core_getversion
 drm_import_export

tests/Makefile.sources +1 -0

index 51e8376..999c8f8 100644
@@ -15,6 +15,7 @@ NOUVEAU_TESTS_M = \
 
 TESTS_progs_M = \
 	core_get_client_auth \
+	core_getparams \
 	drv_suspend \
 	drv_hangman \
 	gem_bad_reloc \

tests/core_getparams.c new file +167 -0

new file mode 100644
index 0000000..2855d06
@@ -0,0 +1,167 @@
+/*
+ * Copyright © 2014 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Jeff McGee <[email protected]>
+ *
+ */
+
+#include <unistd.h>
+#include <errno.h>
+#include <xf86drm.h>
+#include <i915_drm.h>
+#include "drmtest.h"
+#include "intel_chipset.h"
+#include "intel_bufmgr.h"
+
+IGT_TEST_DESCRIPTION("Tests the export of parameters via DRM_IOCTL_I915_GETPARAM\n");
+
+int drm_fd;
+int devid;
+
+static void
+init(void)
+{
+	drm_fd = drm_open_any();
+	devid = intel_get_drm_devid(drm_fd);
+}
+
+static void
+deinit(void)
+{
+	close(drm_fd);
+}
+
+#define LOCAL_I915_PARAM_SUBSLICE_TOTAL	33
+#define LOCAL_I915_PARAM_EU_TOTAL	34
+
+static int
+getparam(int param, int *value)
+{
+	drm_i915_getparam_t gp;
+	int ret;
+
+	memset(&gp, 0, sizeof(gp));
+	gp.value = value;
+	gp.param = param;
+	ret = drmIoctl(drm_fd, DRM_IOCTL_I915_GETPARAM, &gp);
+	if (ret)
+		return -errno;
+
+	return 0;
+}
+
+static void
+subslice_total(void)
+{
+	unsigned int subslice_total = 0;
+	int ret;
+
+	ret = getparam(LOCAL_I915_PARAM_SUBSLICE_TOTAL, (int*)&subslice_total);
+
+	if (ret) {
+		/*
+		 * These devices are not required to implement the
+		 * interface. If they do not, -ENODEV must be returned.
+		*/
+		if ((intel_gen(devid) < 8) ||
+		    IS_BROADWELL(devid) ||
+		    igt_run_in_simulation()) {
+			igt_assert_eq(ret, -ENODEV);
+			igt_info("subslice total: unknown\n");
+		/*
+		 * All other devices must implement the interface, so
+		 * fail them if we are here.
+		*/
+		} else {
+			igt_assert_neq(ret, EINVAL); /* request not recognized? */
+			igt_assert_neq(ret, ENODEV); /* device not supported? */
+			igt_assert_eq(ret, 0); /* other error? */
+		}
+	} else {
+		/*
+		 * On success, just make sure the returned count value is
+		 * non-zero. The validity of the count value for the given
+		 * device is not checked.
+		*/
+		igt_assert_neq(subslice_total, 0);
+		igt_info("subslice total: %u\n", subslice_total);
+	}
+}
+
+static void
+eu_total(void)
+{
+	unsigned int eu_total = 0;
+	int ret;
+
+	ret = getparam(LOCAL_I915_PARAM_EU_TOTAL, (int*)&eu_total);
+
+	if (ret) {
+		/*
+		 * These devices are not required to implement the
+		 * interface. If they do not, -ENODEV must be returned.
+		*/
+		if ((intel_gen(devid) < 8) ||
+		    IS_BROADWELL(devid) ||
+		    igt_run_in_simulation()) {
+			igt_assert_eq(ret, -ENODEV);
+			igt_info("EU total: unknown\n");
+		/*
+		 * All other devices must implement the interface, so
+		 * fail them if we are here.
+		*/
+		} else {
+			igt_assert_neq(ret, EINVAL); /* request not recognized? */
+			igt_assert_neq(ret, ENODEV); /* device not supported? */
+			igt_assert_eq(ret, 0); /* other error? */
+		}
+	} else {
+		/*
+		 * On success, just make sure the returned count value is
+		 * non-zero. The validity of the count value for the given
+		 * device is not checked.
+		*/
+		igt_assert_neq(eu_total, 0);
+		igt_info("EU total: %u\n", eu_total);
+	}
+}
+
+static void
+exit_handler(int sig)
+{
+	deinit();
+}
+
+igt_main
+{
+	igt_fixture {
+		igt_install_exit_handler(exit_handler);
+		init();
+	}
+
+	igt_subtest("subslice-total")
+		subslice_total();
+
+	igt_subtest("eu-total")
+		eu_total();
+}

Signature · 6 lines

2.3.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Quoted 20 lines · Zhigang Gong

My only concern is about the following macros:

tests/core_getparams.c line 55

Quoted 2 lines

tests/core_getparams.c new file +2 -0

+#define LOCAL_I915_PARAM_SUBSLICE_TOTAL      33
+#define LOCAL_I915_PARAM_EU_TOTAL    34

How about to just use the definitons in the kernel header file? For an example:

  #include <drm/i915_drm.h>

  #ifdef LOCAL_I915_PARAM_SUBSLICE_TOTAL
  //Put all the code into this block.
  #endif

Then we can avoid put the same definitions in different files, and we can avoid unecessary testing on an old kernel which doesn't have this kernel interface.

For all the other part, it LGTM.

Quoted 1 line

Reviewed-by Zhigang Gong <[email protected]>

Once we update the libdrm requirements in igt we tend to go around and replace all the now obsolete LOCAL_ defines. Imo not worth doing extra work until then.

Patch applied, thanks.
-Daniel

Quoted 229 lines

Thanks,
Zhigang Gong.

Quoted 224 lines · On Thu, Mar 12, 2015 at 05:26:25PM -0700, [email protected] wrote:

From: Jeff McGee <[email protected]>

New test core_getparams consists of 2 subtests, each one testing the ability of userspace to query the correct value of a GT config
attribute: subslice total or EU total. drm/i915 implementation of these queries is required for Cherryview and Gen9+ devices (non- simulated).

v2: Duplicate small amount of new libdrm functionality to avoid
bumping libdrm version requirement (Daniel). Convert some igt_asserts to the appropriate comparison variants. Add a test description.
v3: Actually use the LOCAL GETPARAM defines. Otherwise can't build
against older libdrm as intended by v2.

For: VIZ-4636

Signed-off-by Jeff McGee <[email protected]>

---
 tests/.gitignore       |   1 +
 tests/Makefile.sources |   1 +
 tests/core_getparams.c | 167 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 169 insertions(+)
 create mode 100644 tests/core_getparams.c

tests/.gitignore +1 -0

index 426cc67..c742308 100644
@@ -1,6 +1,7 @@
 # Please keep sorted alphabetically
 core_get_client_auth
 core_getclient
+core_getparams
 core_getstats
 core_getversion
 drm_import_export

tests/Makefile.sources +1 -0

index 51e8376..999c8f8 100644
@@ -15,6 +15,7 @@ NOUVEAU_TESTS_M = \
 
 TESTS_progs_M = \
 	core_get_client_auth \
+	core_getparams \
 	drv_suspend \
 	drv_hangman \
 	gem_bad_reloc \

tests/core_getparams.c new file +167 -0

new file mode 100644
index 0000000..2855d06
@@ -0,0 +1,167 @@
+/*
+ * Copyright © 2014 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Jeff McGee <[email protected]>
+ *
+ */
+
+#include <unistd.h>
+#include <errno.h>
+#include <xf86drm.h>
+#include <i915_drm.h>
+#include "drmtest.h"
+#include "intel_chipset.h"
+#include "intel_bufmgr.h"
+
+IGT_TEST_DESCRIPTION("Tests the export of parameters via DRM_IOCTL_I915_GETPARAM\n");
+
+int drm_fd;
+int devid;
+
+static void
+init(void)
+{
+	drm_fd = drm_open_any();
+	devid = intel_get_drm_devid(drm_fd);
+}
+
+static void
+deinit(void)
+{
+	close(drm_fd);
+}
+
+#define LOCAL_I915_PARAM_SUBSLICE_TOTAL	33
+#define LOCAL_I915_PARAM_EU_TOTAL	34
+
+static int
+getparam(int param, int *value)
+{
+	drm_i915_getparam_t gp;
+	int ret;
+
+	memset(&gp, 0, sizeof(gp));
+	gp.value = value;
+	gp.param = param;
+	ret = drmIoctl(drm_fd, DRM_IOCTL_I915_GETPARAM, &gp);
+	if (ret)
+		return -errno;
+
+	return 0;
+}
+
+static void
+subslice_total(void)
+{
+	unsigned int subslice_total = 0;
+	int ret;
+
+	ret = getparam(LOCAL_I915_PARAM_SUBSLICE_TOTAL, (int*)&subslice_total);
+
+	if (ret) {
+		/*
+		 * These devices are not required to implement the
+		 * interface. If they do not, -ENODEV must be returned.
+		*/
+		if ((intel_gen(devid) < 8) ||
+		    IS_BROADWELL(devid) ||
+		    igt_run_in_simulation()) {
+			igt_assert_eq(ret, -ENODEV);
+			igt_info("subslice total: unknown\n");
+		/*
+		 * All other devices must implement the interface, so
+		 * fail them if we are here.
+		*/
+		} else {
+			igt_assert_neq(ret, EINVAL); /* request not recognized? */
+			igt_assert_neq(ret, ENODEV); /* device not supported? */
+			igt_assert_eq(ret, 0); /* other error? */
+		}
+	} else {
+		/*
+		 * On success, just make sure the returned count value is
+		 * non-zero. The validity of the count value for the given
+		 * device is not checked.
+		*/
+		igt_assert_neq(subslice_total, 0);
+		igt_info("subslice total: %u\n", subslice_total);
+	}
+}
+
+static void
+eu_total(void)
+{
+	unsigned int eu_total = 0;
+	int ret;
+
+	ret = getparam(LOCAL_I915_PARAM_EU_TOTAL, (int*)&eu_total);
+
+	if (ret) {
+		/*
+		 * These devices are not required to implement the
+		 * interface. If they do not, -ENODEV must be returned.
+		*/
+		if ((intel_gen(devid) < 8) ||
+		    IS_BROADWELL(devid) ||
+		    igt_run_in_simulation()) {
+			igt_assert_eq(ret, -ENODEV);
+			igt_info("EU total: unknown\n");
+		/*
+		 * All other devices must implement the interface, so
+		 * fail them if we are here.
+		*/
+		} else {
+			igt_assert_neq(ret, EINVAL); /* request not recognized? */
+			igt_assert_neq(ret, ENODEV); /* device not supported? */
+			igt_assert_eq(ret, 0); /* other error? */
+		}
+	} else {
+		/*
+		 * On success, just make sure the returned count value is
+		 * non-zero. The validity of the count value for the given
+		 * device is not checked.
+		*/
+		igt_assert_neq(eu_total, 0);
+		igt_info("EU total: %u\n", eu_total);
+	}
+}
+
+static void
+exit_handler(int sig)
+{
+	deinit();
+}
+
+igt_main
+{
+	igt_fixture {
+		igt_install_exit_handler(exit_handler);
+		init();
+	}
+
+	igt_subtest("subslice-total")
+		subslice_total();
+
+	igt_subtest("eu-total")
+		eu_total();
+}

Signature · 1 line

2.3.0

Quoted 8 lines

Quoted 4 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 7 lines

Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Beignet mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/beignet

Quoted 27 lines · Daniel Vetter

Quoted 14 lines · Zhigang Gong

My only concern is about the following macros:

tests/core_getparams.c line 55

Quoted 2 lines

tests/core_getparams.c new file +2 -0

+#define LOCAL_I915_PARAM_SUBSLICE_TOTAL      33
+#define LOCAL_I915_PARAM_EU_TOTAL    34

How about to just use the definitons in the kernel header file? For an example:

  #include <drm/i915_drm.h>

  #ifdef LOCAL_I915_PARAM_SUBSLICE_TOTAL
  //Put all the code into this block.
  #endif

Quoted 7 lines

Then we can avoid put the same definitions in different files, and we can avoid unecessary testing on an old kernel which doesn't have this kernel interface.

For all the other part, it LGTM.

Reviewed-by Zhigang Gong <[email protected]>

Once we update the libdrm requirements in igt we tend to go around and replace all the now obsolete LOCAL_ defines. Imo not worth doing extra work until then.

Quoted 3 lines

Patch applied, thanks.
-Daniel

Patch applied? Do you want me to make the name change first? Should the kernel part be reviewed and merged first?

Quoted 32 lines · Jeff McGee

Quoted 30 lines · Daniel Vetter

Quoted 14 lines · Zhigang Gong

My only concern is about the following macros:

tests/core_getparams.c line 55

Quoted 2 lines

tests/core_getparams.c new file +2 -0

+#define LOCAL_I915_PARAM_SUBSLICE_TOTAL      33
+#define LOCAL_I915_PARAM_EU_TOTAL    34

How about to just use the definitons in the kernel header file? For an example:

  #include <drm/i915_drm.h>

  #ifdef LOCAL_I915_PARAM_SUBSLICE_TOTAL
  //Put all the code into this block.
  #endif

Quoted 7 lines

Then we can avoid put the same definitions in different files, and we can avoid unecessary testing on an old kernel which doesn't have this kernel interface.

For all the other part, it LGTM.

Reviewed-by Zhigang Gong <[email protected]>

Once we update the libdrm requirements in igt we tend to go around and replace all the now obsolete LOCAL_ defines. Imo not worth doing extra work until then.

Patch applied, thanks.
-Daniel

Quoted 2 lines

Patch applied? Do you want me to make the name change first? Should the kernel part be reviewed and merged first?

Forgot my own review comment already ;-) Fixed up with a follow-up patch. And I'll pull the kernel part in now too.
-Daniel