[Intel-gfx] [PATCH] shader-debugger: Use in tree gen4asm

[Paulo Zanoni]

2013/12/21 Ben Widawsky <benjamin.widawsky at intel.com>:
> Reported-by: Patrick McMunn <doctorwhoguy at gmail.com>
> Signed-off-by: Ben Widawsky <ben at bwidawsk.net>

I see this got merged. Now when I run autogen.sh I get:
./configure: line 20866: GEN4ASM: command not found


But the autogen command finishes successfully:

Intel GPU tools

 • Tests:
       Build tests        : yes
       Compile prime tests: yes

 • Tools:
       Assembler          : no
       Debugger           : yes
       Python dumper      : yes
       Overlay            : X: yes, Xv: yes


But then when I type "make" I get this at some point:

Making all in system_routine
make[3]: Entering directory
`/home/pzanoni/git/xorg/app/intel-gpu-tools/debugger/system_routine'
gcc -E -x assembler-with-cpp -P -DGEN_ASM -DSANDYBRIDGE -I../../lib
-I. -o sr.asm sr.cpp
../../assembler/intel-gen4asm -g6 -a -b sr.asm -o sr.c
make[3]: ../../assembler/intel-gen4asm: Command not found
make[3]: *** [sr.c] Error 127

And then compilation fails.

> ---
>  configure.ac                        | 21 ++++++++++-----------
>  debugger/system_routine/Makefile.am |  1 +
>  2 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index b43f45c..55cc78f 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -133,13 +133,20 @@ if test "x$DUMPER" == xyes; then
>  fi
>  AM_CONDITIONAL(HAVE_DUMPER, [test "x$DUMPER" = xyes])
>
> -# Define a configure option for the shadder debugger
> +# Define a configure option for the shader debugger
>  AC_ARG_ENABLE(shader-debugger, AS_HELP_STRING([--enable-shader-debugger],
>               [Enable shader debugging support [autodetected]]),
>               [BUILD_SHADER_DEBUGGER="$enableval"], [BUILD_SHADER_DEBUGGER=auto])
>
> -# Shadder debugger depends on python3, intel-genasm and objcopy
> +# Shader debugger depends on python3, intel-genasm and objcopy
>  if test "x$BUILD_SHADER_DEBUGGER" != xno; then
> +       GEN4ASM = assembler/intel-gen4asm
> +       # Check that the assembler is built
> +       if test "$enable_assembler" = xno; then
> +               AC_MSG_ERROR([Shader debugger requested, but assembler not build not found.])
> +               BUILD_SHADER_DEBUGGER=no
> +       fi
> +
>         # Check Python 3 is installed
>         if test "$PYTHON" = ":" ; then
>                 if test "x$BUILD_SHADER_DEBUGGER" = xyes; then
> @@ -148,15 +155,7 @@ if test "x$BUILD_SHADER_DEBUGGER" != xno; then
>                         BUILD_SHADER_DEBUGGER=no
>                 fi
>         fi
> -       # Check for the Intel Chipset assembler compiler
> -       AC_PATH_PROGS([GEN4ASM], intel-gen4asm)
> -       if test -z "$GEN4ASM" ; then
> -               if test "x$BUILD_SHADER_DEBUGGER" = xyes; then
> -                       AC_MSG_ERROR([Shader debugger requested, but intel-gen4asm not found.])
> -               else
> -                       BUILD_SHADER_DEBUGGER=no
> -               fi
> -       fi
> +
>         # Check for the objcopy GNU binary utiliy command
>         AC_PATH_PROGS([OBJCOPY], objcopy)
>         if test -z "$OBJCOPY" ; then
> diff --git a/debugger/system_routine/Makefile.am b/debugger/system_routine/Makefile.am
> index 03f0f0f..95d8fb6 100644
> --- a/debugger/system_routine/Makefile.am
> +++ b/debugger/system_routine/Makefile.am
> @@ -3,6 +3,7 @@ noinst_PROGRAMS = eviction_macro sr tiny
>  nodist_sr_SOURCES = sr.c
>  nodist_tiny_SOURCES = tiny.c
>
> +GEN4ASM = $(top_builddir)/assembler/intel-gen4asm
>  GEN4ASM_FLAGS = -g6 -a -b
>  ASM_CPPFLAGS =                                 \
>         -x assembler-with-cpp           \
> --
> 1.8.5.2
>



-- 
Paulo Zanoni