* [PATCH 00/10] fs debugging: incorporated Chris' feedback
@ 2011-07-17 23:25 Ben Widawsky
2011-07-17 23:25 ` [PATCH 01/10] intel: shared header for shader debugging Ben Widawsky
0 siblings, 1 reply; 5+ messages in thread
From: Ben Widawsky @ 2011-07-17 23:25 UTC (permalink / raw)
To: intel-gfx; +Cc: mesa-dev, Ben Widawsky, Carl Worth, dri-devel
This is the revised patch series for fragment shader debugging.
There is no major change, though of interest are:
* forcewaked acts more like a daemon
* forcewaked isn't needed for debugging only there for sample
* i915 detection is now done by stating i915_forcewake_user_lock
* register range checking fails for gen2/gen3
drm:
intel/Makefile.am | 3 ++-
intel/intel_debug.h | 44 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 1 deletions(-)
mesa:
src/mesa/drivers/dri/i965/Makefile | 1 +
src/mesa/drivers/dri/i965/brw_context.h | 6 +
src/mesa/drivers/dri/i965/brw_eu.c | 6 +
src/mesa/drivers/dri/i965/brw_eu.h | 1 +
src/mesa/drivers/dri/i965/brw_fs_emit.cpp | 15 +-
src/mesa/drivers/dri/i965/brw_misc_state.c | 12 +-
src/mesa/drivers/dri/i965/brw_state.h | 6 +-
src/mesa/drivers/dri/i965/brw_state_cache.c | 49 +-
src/mesa/drivers/dri/i965/brw_state_upload.c | 18 +-
src/mesa/drivers/dri/i965/brw_wm.c | 27 +-
src/mesa/drivers/dri/i965/brw_wm.h | 2 +
src/mesa/drivers/dri/i965/brw_wm_debug.c | 108 +
src/mesa/drivers/dri/i965/brw_wm_emit.c | 2 +
src/mesa/drivers/dri/i965/gen6_wm_sr.c | 31 +
src/mesa/drivers/dri/i965/gen_wm_sr.g4a |32826 ++++++++++++++++++++++++++
15 files changed, 33087 insertions(+), 23 deletions(-)
intel-gpu-tools:
configure.ac | 1 +
debugger/Makefile.am | 12 +
debugger/debug_rdata.c | 141 +++++++
debugger/eudb.c | 604 ++++++++++++++++++++++++++++++
debugger/system_routine/Makefile | 84 ++++
debugger/system_routine/eviction_macro.c | 48 +++
debugger/system_routine/pre_cpp.py | 123 ++++++
debugger/system_routine/sr.g4a | 277 ++++++++++++++
debugger/system_routine/test.g4a | 64 ++++
lib/Makefile.am | 1 +
lib/debug.h | 92 +++++
lib/intel_chipset.h | 8 +
lib/intel_gpu_tools.h | 27 ++
lib/intel_mmio.c | 162 ++++++++-
lib/intel_reg.h | 4 +
lib/intel_reg_map.c | 178 +++++++++
tools/Makefile.am | 1 +
tools/forcewaked.c | 106 ++++++
18 files changed, 1932 insertions(+), 1 deletions(-)
Thanks.
Ben
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 01/10] intel: shared header for shader debugging
2011-07-17 23:25 [PATCH 00/10] fs debugging: incorporated Chris' feedback Ben Widawsky
@ 2011-07-17 23:25 ` Ben Widawsky
0 siblings, 0 replies; 5+ messages in thread
From: Ben Widawsky @ 2011-07-17 23:25 UTC (permalink / raw)
To: intel-gfx; +Cc: Ben Widawsky, Carl Worth, dri-devel
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
---
intel/Makefile.am | 3 ++-
intel/intel_debug.h | 44 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 1 deletions(-)
diff --git a/intel/Makefile.am b/intel/Makefile.am
index b6a9014..7a44aaf 100644
--- a/intel/Makefile.am
+++ b/intel/Makefile.am
@@ -45,6 +45,7 @@ libdrm_intel_la_SOURCES = \
mm.h
libdrm_intelincludedir = ${includedir}/libdrm
-libdrm_intelinclude_HEADERS = intel_bufmgr.h
+libdrm_intelinclude_HEADERS = intel_bufmgr.h \
+ intel_debug.h
pkgconfig_DATA = libdrm_intel.pc
diff --git a/intel/intel_debug.h b/intel/intel_debug.h
new file mode 100644
index 0000000..68c3f62
--- /dev/null
+++ b/intel/intel_debug.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2011 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:
+ * Ben Widawsky <ben@bwidawsk.net>
+ *
+ */
+
+#ifndef INTEL_DEBUG_H
+#define INTEL_DEBUG_H
+
+#include <stdint.h>
+
+#define SHADER_DEBUG_SOCKET "/tmp/gen_debug"
+#define DEBUG_HANDSHAKE_VERSION 0x2
+#define DEBUG_HANDSHAKE_ACK "okay"
+
+/* First byte must always be the 1 byte version */
+struct intel_debug_handshake {
+ uint8_t version;
+ int flink_handle;
+ uint32_t per_thread_scratch;
+} __attribute__((packed));
+
+#endif
--
1.7.6
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 0/10] fs shader debugging
@ 2011-07-13 20:51 Ben Widawsky
2011-07-13 20:51 ` [PATCH 01/10] intel: shared header for " Ben Widawsky
0 siblings, 1 reply; 5+ messages in thread
From: Ben Widawsky @ 2011-07-13 20:51 UTC (permalink / raw)
To: intel-gfx; +Cc: mesa-dev, Ben Widawsky, Carl Worth, dri-devel
Version 2 of the patch series is pretty much the same as version 1. 2 of the
patches have already been picked up by the kernel and mesa so they are
gone.
The only major change is in mesa where I no longer load a binary blob
from an environment variable, but instead compile the bytes directly in
to Mesa.
Ben
Mesa:
src/mesa/drivers/dri/i965/Makefile | 1 +
src/mesa/drivers/dri/i965/brw_context.h | 6 +
src/mesa/drivers/dri/i965/brw_eu.c | 6 +
src/mesa/drivers/dri/i965/brw_eu.h | 1 +
src/mesa/drivers/dri/i965/brw_fs_emit.cpp | 15 +-
src/mesa/drivers/dri/i965/brw_misc_state.c | 13 +-
src/mesa/drivers/dri/i965/brw_state.h | 6 +-
src/mesa/drivers/dri/i965/brw_state_cache.c | 49 +-
src/mesa/drivers/dri/i965/brw_state_upload.c | 18 +-
src/mesa/drivers/dri/i965/brw_wm.c | 27 +-
src/mesa/drivers/dri/i965/brw_wm.h | 2 +
src/mesa/drivers/dri/i965/brw_wm_debug.c | 108 +
src/mesa/drivers/dri/i965/brw_wm_emit.c | 2 +
src/mesa/drivers/dri/i965/gen6_wm_sr.c | 31 +
src/mesa/drivers/dri/i965/gen_wm_sr.g4a |32826 ++++++++++++++++++++++++++
15 files changed, 33088 insertions(+), 23 deletions(-)
libdrm:
intel/Makefile.am | 3 ++-
intel/intel_debug.h | 44 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 1 deletions(-)
intel-gpu-tools:
configure.ac | 1 +
debugger/Makefile.am | 12 +
debugger/debug_rdata.c | 141 +++++++
debugger/eudb.c | 590 ++++++++++++++++++++++++++++++
debugger/system_routine/Makefile | 84 +++++
debugger/system_routine/eviction_macro.c | 48 +++
debugger/system_routine/pre_cpp.py | 123 +++++++
debugger/system_routine/sr.g4a | 277 ++++++++++++++
debugger/system_routine/test.g4a | 64 ++++
lib/Makefile.am | 1 +
lib/debug.h | 92 +++++
lib/intel_chipset.h | 8 +
lib/intel_gpu_tools.h | 27 ++
lib/intel_mmio.c | 178 +++++++++
lib/intel_reg.h | 5 +
lib/intel_reg_map.c | 174 +++++++++
tools/Makefile.am | 1 +
tools/forcewaked.c | 45 +++
18 files changed, 1871 insertions(+), 0 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 01/10] intel: shared header for shader debugging
2011-07-13 20:51 [PATCH 0/10] fs " Ben Widawsky
@ 2011-07-13 20:51 ` Ben Widawsky
2011-07-13 20:56 ` Chris Wilson
2011-07-19 21:06 ` [Intel-gfx] " Julien Cristau
0 siblings, 2 replies; 5+ messages in thread
From: Ben Widawsky @ 2011-07-13 20:51 UTC (permalink / raw)
To: intel-gfx; +Cc: Ben Widawsky, Carl Worth, dri-devel
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
---
intel/Makefile.am | 3 ++-
intel/intel_debug.h | 44 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 1 deletions(-)
diff --git a/intel/Makefile.am b/intel/Makefile.am
index b6a9014..7a44aaf 100644
--- a/intel/Makefile.am
+++ b/intel/Makefile.am
@@ -45,6 +45,7 @@ libdrm_intel_la_SOURCES = \
mm.h
libdrm_intelincludedir = ${includedir}/libdrm
-libdrm_intelinclude_HEADERS = intel_bufmgr.h
+libdrm_intelinclude_HEADERS = intel_bufmgr.h \
+ intel_debug.h
pkgconfig_DATA = libdrm_intel.pc
diff --git a/intel/intel_debug.h b/intel/intel_debug.h
new file mode 100644
index 0000000..42ea1d8
--- /dev/null
+++ b/intel/intel_debug.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2011 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:
+ * Ben Widawsky <ben@bwidawsk.net>
+ *
+ */
+
+#ifndef INTEL_DEBUG_H
+#define INTEL_DEBUG_H
+
+#include <stdint.h>
+
+#define SHADER_DEBUG_SOCKET "/tmp/gen_debug"
+#define DEBUG_HANDSHAKE_VERSION 0x2
+#define DEBUG_HANDSHAKE_ACK "okay"
+
+/* First byte must always be the 1 byte version */
+struct debug_handshake {
+ uint8_t version;
+ int flink_handle;
+ uint32_t per_thread_scratch;
+} __attribute__((packed));
+
+#endif
--
1.7.6
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 01/10] intel: shared header for shader debugging
2011-07-13 20:51 ` [PATCH 01/10] intel: shared header for " Ben Widawsky
@ 2011-07-13 20:56 ` Chris Wilson
2011-07-19 21:06 ` [Intel-gfx] " Julien Cristau
1 sibling, 0 replies; 5+ messages in thread
From: Chris Wilson @ 2011-07-13 20:56 UTC (permalink / raw)
To: intel-gfx; +Cc: Ben Widawsky, Carl Worth, dri-devel
[-- Attachment #1: Type: text/plain, Size: 2926 bytes --]
On Wed, 13 Jul 2011 13:51:43 -0700, Ben Widawsky <ben@bwidawsk.net> wrote:
>
> Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
> ---
> intel/Makefile.am | 3 ++-
> intel/intel_debug.h | 44 ++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 46 insertions(+), 1 deletions(-)
>
> diff --git a/intel/Makefile.am b/intel/Makefile.am
> index b6a9014..7a44aaf 100644
> --- a/intel/Makefile.am
> +++ b/intel/Makefile.am
> @@ -45,6 +45,7 @@ libdrm_intel_la_SOURCES = \
> mm.h
>
> libdrm_intelincludedir = ${includedir}/libdrm
> -libdrm_intelinclude_HEADERS = intel_bufmgr.h
> +libdrm_intelinclude_HEADERS = intel_bufmgr.h \
> + intel_debug.h
>
> pkgconfig_DATA = libdrm_intel.pc
> diff --git a/intel/intel_debug.h b/intel/intel_debug.h
> new file mode 100644
> index 0000000..42ea1d8
> --- /dev/null
> +++ b/intel/intel_debug.h
> @@ -0,0 +1,44 @@
> +/*
> + * Copyright © 2011 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:
> + * Ben Widawsky <ben@bwidawsk.net>
> + *
> + */
> +
> +#ifndef INTEL_DEBUG_H
> +#define INTEL_DEBUG_H
> +
> +#include <stdint.h>
> +
> +#define SHADER_DEBUG_SOCKET "/tmp/gen_debug"
> +#define DEBUG_HANDSHAKE_VERSION 0x2
> +#define DEBUG_HANDSHAKE_ACK "okay"
> +
> +/* First byte must always be the 1 byte version */
> +struct debug_handshake {
> + uint8_t version;
> + int flink_handle;
> + uint32_t per_thread_scratch;
> +} __attribute__((packed));
Let's use an intel_ namespace to avoid any potential confusion. Do you
want to reserve the first uint32_t for your protocol header? Then it at
least looks like the hole will be useful in future...
I'm not overly thrilled by intel_debug.h, it's so generic but I can't
think of anything better.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH 01/10] intel: shared header for shader debugging
2011-07-13 20:51 ` [PATCH 01/10] intel: shared header for " Ben Widawsky
2011-07-13 20:56 ` Chris Wilson
@ 2011-07-19 21:06 ` Julien Cristau
2011-07-21 13:54 ` Ben Widawsky
1 sibling, 1 reply; 5+ messages in thread
From: Julien Cristau @ 2011-07-19 21:06 UTC (permalink / raw)
To: Ben Widawsky; +Cc: intel-gfx, dri-devel
On Wed, Jul 13, 2011 at 13:51:43 -0700, Ben Widawsky wrote:
> +#define SHADER_DEBUG_SOCKET "/tmp/gen_debug"
Not sure what this is used for, but does it really need to be in /tmp?
Cheers,
Julien
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 01/10] intel: shared header for shader debugging
2011-07-19 21:06 ` [Intel-gfx] " Julien Cristau
@ 2011-07-21 13:54 ` Ben Widawsky
0 siblings, 0 replies; 5+ messages in thread
From: Ben Widawsky @ 2011-07-21 13:54 UTC (permalink / raw)
To: Julien Cristau; +Cc: intel-gfx, dri-devel
On Tue, Jul 19, 2011 at 11:06:17PM +0200, Julien Cristau wrote:
> On Wed, Jul 13, 2011 at 13:51:43 -0700, Ben Widawsky wrote:
>
> > +#define SHADER_DEBUG_SOCKET "/tmp/gen_debug"
>
> Not sure what this is used for, but does it really need to be in /tmp?
It is the shared socket between a debug client (ie. Mesa) and the
debugger. I don't care where it goes, do you have any recommendations?
>
> Cheers,
> Julien
Thanks.
Ben
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-07-21 13:54 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-17 23:25 [PATCH 00/10] fs debugging: incorporated Chris' feedback Ben Widawsky
2011-07-17 23:25 ` [PATCH 01/10] intel: shared header for shader debugging Ben Widawsky
-- strict thread matches above, loose matches on Subject: below --
2011-07-13 20:51 [PATCH 0/10] fs " Ben Widawsky
2011-07-13 20:51 ` [PATCH 01/10] intel: shared header for " Ben Widawsky
2011-07-13 20:56 ` Chris Wilson
2011-07-19 21:06 ` [Intel-gfx] " Julien Cristau
2011-07-21 13:54 ` Ben Widawsky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).