For the series:
Reviewed-by: Marek Olšák <marek.ol...@amd.com>
Marek
On Mon, Feb 27, 2017 at 1:49 AM, Timothy Arceri <tarc...@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
>
> 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
>
> AM_CFLAGS += \
> $(LLVM_CFLAGS) \
> $(LIBELF_CFLAGS)
>
> -libradeon_la_SOURCES += \
> - $(LLVM_C_FILES)
> -
> libradeon_la_LIBADD = \
> $(CLOCK_LIB) \
> $(LLVM_LIBS) \
> $(LIBELF_LIBS)
>
> libradeon_la_LDFLAGS = \
> $(LLVM_LDFLAGS)
>
> endif
>
> diff --git a/src/gallium/drivers/radeon/Makefile.sources
> b/src/gallium/drivers/radeon/Makefile.sources
> index 3e13dae..9dd4e1a 100644
> --- a/src/gallium/drivers/radeon/Makefile.sources
> +++ b/src/gallium/drivers/radeon/Makefile.sources
> @@ -15,14 +15,10 @@ C_SOURCES := \
> radeon_uvd.c \
> radeon_uvd.h \
> radeon_vce_40_2_2.c \
> radeon_vce_50.c \
> radeon_vce_52.c \
> radeon_vce.c \
> radeon_vce.h \
> radeon_video.c \
> radeon_video.h \
> radeon_winsys.h
> -
> -LLVM_C_FILES := \
> - radeon_elf_util.c \
> - radeon_elf_util.h
> diff --git a/src/gallium/drivers/radeon/radeon_elf_util.c
> b/src/gallium/drivers/radeon/radeon_elf_util.c
> deleted file mode 100644
> index 21a7ed5..0000000
> --- a/src/gallium/drivers/radeon/radeon_elf_util.c
> +++ /dev/null
> @@ -1,197 +0,0 @@
> -/*
> - * Copyright 2014 Advanced Micro Devices, Inc.
> - *
> - * 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: Tom Stellard <thomas.stell...@amd.com>
> - *
> - */
> -
> -#include "radeon_elf_util.h"
> -#include "r600_pipe_common.h"
> -
> -#include "util/u_memory.h"
> -
> -#include <gelf.h>
> -#include <libelf.h>
> -#include <stdio.h>
> -
> -static void parse_symbol_table(Elf_Data *symbol_table_data,
> - const GElf_Shdr *symbol_table_header,
> - struct ac_shader_binary *binary)
> -{
> - GElf_Sym symbol;
> - unsigned i = 0;
> - unsigned symbol_count =
> - symbol_table_header->sh_size /
> symbol_table_header->sh_entsize;
> -
> - /* We are over allocating this list, because symbol_count gives the
> - * total number of symbols, and we will only be filling the list
> - * with offsets of global symbols. The memory savings from
> - * allocating the correct size of this list will be small, and
> - * I don't think it is worth the cost of pre-computing the number
> - * of global symbols.
> - */
> - binary->global_symbol_offsets = CALLOC(symbol_count,
> sizeof(uint64_t));
> -
> - while (gelf_getsym(symbol_table_data, i++, &symbol)) {
> - unsigned i;
> - if (GELF_ST_BIND(symbol.st_info) != STB_GLOBAL ||
> - symbol.st_shndx == 0 /* Undefined symbol */) {
> - continue;
> - }
> -
> - binary->global_symbol_offsets[binary->global_symbol_count] =
> - symbol.st_value;
> -
> - /* Sort the list using bubble sort. This list will usually
> - * be small. */
> - for (i = binary->global_symbol_count; i > 0; --i) {
> - uint64_t lhs = binary->global_symbol_offsets[i - 1];
> - uint64_t rhs = binary->global_symbol_offsets[i];
> - if (lhs < rhs) {
> - break;
> - }
> - binary->global_symbol_offsets[i] = lhs;
> - binary->global_symbol_offsets[i - 1] = rhs;
> - }
> - ++binary->global_symbol_count;
> - }
> -}
> -
> -static void parse_relocs(Elf *elf, Elf_Data *relocs, Elf_Data *symbols,
> - unsigned symbol_sh_link,
> - struct ac_shader_binary *binary)
> -{
> - unsigned i;
> -
> - if (!relocs || !symbols || !binary->reloc_count) {
> - return;
> - }
> - binary->relocs = CALLOC(binary->reloc_count,
> - sizeof(struct ac_shader_reloc));
> - for (i = 0; i < binary->reloc_count; i++) {
> - GElf_Sym symbol;
> - GElf_Rel rel;
> - char *symbol_name;
> - struct ac_shader_reloc *reloc = &binary->relocs[i];
> -
> - gelf_getrel(relocs, i, &rel);
> - gelf_getsym(symbols, GELF_R_SYM(rel.r_info), &symbol);
> - symbol_name = elf_strptr(elf, symbol_sh_link, symbol.st_name);
> -
> - reloc->offset = rel.r_offset;
> - strncpy(reloc->name, symbol_name, sizeof(reloc->name)-1);
> - reloc->name[sizeof(reloc->name)-1] = 0;
> - }
> -}
> -
> -void radeon_elf_read(const char *elf_data, unsigned elf_size,
> - struct ac_shader_binary *binary)
> -{
> - char *elf_buffer;
> - Elf *elf;
> - Elf_Scn *section = NULL;
> - Elf_Data *symbols = NULL, *relocs = NULL;
> - size_t section_str_index;
> - unsigned symbol_sh_link = 0;
> -
> - /* One of the libelf implementations
> - * (http://www.mr511.de/software/english.htm) requires calling
> - * elf_version() before elf_memory().
> - */
> - elf_version(EV_CURRENT);
> - elf_buffer = MALLOC(elf_size);
> - memcpy(elf_buffer, elf_data, elf_size);
> -
> - elf = elf_memory(elf_buffer, elf_size);
> -
> - elf_getshdrstrndx(elf, §ion_str_index);
> -
> - while ((section = elf_nextscn(elf, section))) {
> - const char *name;
> - Elf_Data *section_data = NULL;
> - GElf_Shdr section_header;
> - if (gelf_getshdr(section, §ion_header) !=
> §ion_header) {
> - fprintf(stderr, "Failed to read ELF section
> header\n");
> - return;
> - }
> - name = elf_strptr(elf, section_str_index,
> section_header.sh_name);
> - if (!strcmp(name, ".text")) {
> - section_data = elf_getdata(section, section_data);
> - binary->code_size = section_data->d_size;
> - binary->code = MALLOC(binary->code_size *
> sizeof(unsigned char));
> - memcpy(binary->code, section_data->d_buf,
> binary->code_size);
> - } else if (!strcmp(name, ".AMDGPU.config")) {
> - section_data = elf_getdata(section, section_data);
> - binary->config_size = section_data->d_size;
> - binary->config = MALLOC(binary->config_size *
> sizeof(unsigned char));
> - memcpy(binary->config, section_data->d_buf,
> binary->config_size);
> - } else if (!strcmp(name, ".AMDGPU.disasm")) {
> - /* Always read disassembly if it's available. */
> - section_data = elf_getdata(section, section_data);
> - binary->disasm_string = strndup(section_data->d_buf,
> - section_data->d_size);
> - } else if (!strncmp(name, ".rodata", 7)) {
> - section_data = elf_getdata(section, section_data);
> - binary->rodata_size = section_data->d_size;
> - binary->rodata = MALLOC(binary->rodata_size *
> sizeof(unsigned char));
> - memcpy(binary->rodata, section_data->d_buf,
> binary->rodata_size);
> - } else if (!strncmp(name, ".symtab", 7)) {
> - symbols = elf_getdata(section, section_data);
> - symbol_sh_link = section_header.sh_link;
> - parse_symbol_table(symbols, §ion_header, binary);
> - } else if (!strcmp(name, ".rel.text")) {
> - relocs = elf_getdata(section, section_data);
> - binary->reloc_count = section_header.sh_size /
> - section_header.sh_entsize;
> - }
> - }
> -
> - parse_relocs(elf, relocs, symbols, symbol_sh_link, binary);
> -
> - if (elf){
> - elf_end(elf);
> - }
> - FREE(elf_buffer);
> -
> - /* Cache the config size per symbol */
> - if (binary->global_symbol_count) {
> - binary->config_size_per_symbol =
> - binary->config_size / binary->global_symbol_count;
> - } else {
> - binary->global_symbol_count = 1;
> - binary->config_size_per_symbol = binary->config_size;
> - }
> -}
> -
> -const unsigned char *radeon_shader_binary_config_start(
> - const struct ac_shader_binary *binary,
> - uint64_t symbol_offset)
> -{
> - unsigned i;
> - for (i = 0; i < binary->global_symbol_count; ++i) {
> - if (binary->global_symbol_offsets[i] == symbol_offset) {
> - unsigned offset = i * binary->config_size_per_symbol;
> - return binary->config + offset;
> - }
> - }
> - return binary->config;
> -}
> diff --git a/src/gallium/drivers/radeon/radeon_elf_util.h
> b/src/gallium/drivers/radeon/radeon_elf_util.h
> deleted file mode 100644
> index 4d8318c..0000000
> --- a/src/gallium/drivers/radeon/radeon_elf_util.h
> +++ /dev/null
> @@ -1,49 +0,0 @@
> -/*
> - * Copyright 2014 Advanced Micro Devices, Inc.
> - *
> - * 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: Tom Stellard <thomas.stell...@amd.com>
> - *
> - */
> -
> -#ifndef RADEON_ELF_UTIL_H
> -#define RADEON_ELF_UTIL_H
> -
> -#include <stdint.h>
> -
> -struct ac_shader_binary;
> -
> -/*
> - * Parse the elf binary stored in \p elf_data and create a
> - * radeon_shader_binary object.
> - */
> -void radeon_elf_read(const char *elf_data, unsigned elf_size,
> - struct ac_shader_binary *binary);
> -
> -/**
> - * @returns A pointer to the start of the configuration information for
> - * the function starting at \p symbol_offset of the binary.
> - */
> -const unsigned char *radeon_shader_binary_config_start(
> - const struct ac_shader_binary *binary,
> - uint64_t symbol_offset);
> -
> -#endif /* RADEON_ELF_UTIL_H */
> diff --git a/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c
> b/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c
> index f5c672e..0f34e75 100644
> --- a/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c
> +++ b/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c
> @@ -16,21 +16,20 @@
> * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
> * THE AUTHOR(S) AND/OR THEIR SUPPLIERS 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.
> */
>
> #include "si_shader_internal.h"
> #include "si_pipe.h"
> -#include "radeon/radeon_elf_util.h"
>
> #include "gallivm/lp_bld_const.h"
> #include "gallivm/lp_bld_gather.h"
> #include "gallivm/lp_bld_flow.h"
> #include "gallivm/lp_bld_init.h"
> #include "gallivm/lp_bld_intr.h"
> #include "gallivm/lp_bld_misc.h"
> #include "gallivm/lp_bld_swizzle.h"
> #include "tgsi/tgsi_info.h"
> #include "tgsi/tgsi_parse.h"
> --
> 2.9.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
