[Mesa-dev] [PATCH 6/6] radeon: remove unused radeon_elf_util.{c, h}

[Emil Velikov]

Hi Tim,

Haven't looked at the code but it seems like we can drop

On 27 February 2017 at 00:49, Timothy Arceri <tarceri at itsqueeze.com> wrote:
> We now use the shared code in AMD common instead.
> ---
>  src/gallium/drivers/r600/evergreen_compute.c       |   1 -
>  src/gallium/drivers/radeon/Android.mk              |   1 -
>  src/gallium/drivers/radeon/Makefile.am             |   3 -
>  src/gallium/drivers/radeon/Makefile.sources        |   4 -
>  src/gallium/drivers/radeon/radeon_elf_util.c       | 197 ---------------------
>  src/gallium/drivers/radeon/radeon_elf_util.h       |  49 -----
>  .../drivers/radeonsi/si_shader_tgsi_setup.c        |   1 -
>  7 files changed, 256 deletions(-)
>  delete mode 100644 src/gallium/drivers/radeon/radeon_elf_util.c
>  delete mode 100644 src/gallium/drivers/radeon/radeon_elf_util.h
>
> diff --git a/src/gallium/drivers/r600/evergreen_compute.c b/src/gallium/drivers/r600/evergreen_compute.c
> index 2ddcbb3..ca2081a 100644
> --- a/src/gallium/drivers/r600/evergreen_compute.c
> +++ b/src/gallium/drivers/r600/evergreen_compute.c
> @@ -40,21 +40,20 @@
>  #include "util/u_framebuffer.h"
>  #include "pipebuffer/pb_buffer.h"
>  #include "evergreend.h"
>  #include "r600_shader.h"
>  #include "r600_pipe.h"
>  #include "r600_formats.h"
>  #include "evergreen_compute.h"
>  #include "evergreen_compute_internal.h"
>  #include "compute_memory_pool.h"
>  #include "sb/sb_public.h"
> -#include "radeon/radeon_elf_util.h"
>  #include <inttypes.h>
>
>  /**
>  RAT0 is for global binding write
>  VTX1 is for global binding read
>
>  for wrting images RAT1...
>  for reading images TEX2...
>    TEX2-RAT1 is paired
>
> diff --git a/src/gallium/drivers/radeon/Android.mk b/src/gallium/drivers/radeon/Android.mk
> index 31eaa16..2bddac8 100644
> --- a/src/gallium/drivers/radeon/Android.mk
> +++ b/src/gallium/drivers/radeon/Android.mk
> @@ -24,19 +24,18 @@
>  LOCAL_PATH := $(call my-dir)
>
>  # get C_SOURCES
>  include $(LOCAL_PATH)/Makefile.sources
>
>  include $(CLEAR_VARS)
>
>  LOCAL_SRC_FILES := $(C_SOURCES)
>
>  ifeq ($(MESA_ENABLE_LLVM),true)
> -LOCAL_SRC_FILES += $(LLVM_C_FILES)
>  LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU   # instructs LLVM to declare LLVMInitializeAMDGPU* functions
>  endif
>
If the LLVM_CFLAGS hunk below is no needed then we can drop the whole ifeq

>  LOCAL_SHARED_LIBRARIES := libdrm_radeon
>  LOCAL_MODULE := libmesa_pipe_radeon
>
>  include $(GALLIUM_COMMON_MK)
>  include $(BUILD_STATIC_LIBRARY)
> diff --git a/src/gallium/drivers/radeon/Makefile.am b/src/gallium/drivers/radeon/Makefile.am
> index a6fc145..64c2799 100644
> --- a/src/gallium/drivers/radeon/Makefile.am
> +++ b/src/gallium/drivers/radeon/Makefile.am
> @@ -12,23 +12,20 @@ noinst_LTLIBRARIES = libradeon.la
>
>  libradeon_la_SOURCES = \
>         $(C_SOURCES)
>
>  if NEED_RADEON_LLVM
>
We can drop the whole NEED_RADEON_LLVM section right ?
Including all the hunk in r600/Makefile.am.

Haven't checked the includes so one might need the LLVM/LIBELF_CFLAGS
-> quick (mv && nano libelf.pc) will do the latter.

>  libradeon_la_LIBADD = \
>         $(CLOCK_LIB) \
>         $(LLVM_LIBS) \
>         $(LIBELF_LIBS)

Although we might need to move CLOCK/LIBELF_LIB to
src/gallium/drivers/{r600,radeonsi}/Automake.inc TARGET_LIB_DEPS

Can you address that (as follow-up is fine) please ?

Thanks
Emil