radeon/ac: switch from radeon_elf_read() to ac_elf_read()

Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/gallium/drivers/r600/evergreen_compute.c b/src/gallium/drivers/r600/evergreen_compute.c
index cf56d048b15015781fa736990c6236b445bbd006..2d5130fa97654e3ca4d0b483863cf9a46afd24c9 100644 (file)
--- a/src/gallium/drivers/r600/evergreen_compute.c
+++ b/src/gallium/drivers/r600/evergreen_compute.c
@@ -251,7 +251,7 @@ static void *evergreen_create_compute_state(struct pipe_context *ctx,
        header = cso->prog;
        code = cso->prog + sizeof(struct pipe_llvm_program_header);
        radeon_shader_binary_init(&shader->binary);
-       radeon_elf_read(code, header->num_bytes, &shader->binary);
+       ac_elf_read(code, header->num_bytes, &shader->binary);
        r600_create_shader(&shader->bc, &shader->binary, &use_kill);
 
        /* Upload code + ROdata */

diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c
index f4efb0df8d3d123566fb51ba04c8d065cbde0ff2..5097c81780e6c1f7798bbef8be1e9e3254e0e9e1 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -25,7 +25,6 @@
 #include "tgsi/tgsi_parse.h"
 #include "util/u_memory.h"
 #include "util/u_upload_mgr.h"
-#include "radeon/radeon_elf_util.h"
 
 #include "amd_kernel_code_t.h"
 #include "radeon/r600_cs.h"
@@ -160,7 +159,7 @@ static void *si_create_compute_state(
                header = cso->prog;
                code = cso->prog + sizeof(struct pipe_llvm_program_header);
 
-               radeon_elf_read(code, header->num_bytes, &program->shader.binary);
+               ac_elf_read(code, header->num_bytes, &program->shader.binary);
                if (program->use_code_object_v2) {
                        const amd_kernel_code_t *code_object =
                                si_compute_get_code_object(program, 0);

diff --git a/src/gallium/drivers/radeonsi/si_debug.c b/src/gallium/drivers/radeonsi/si_debug.c
index f04b8fa155e94c2926d9078cbdd96fa3b70483ad..1092aa2761afbbbd2bf5f1b017b825b63e0b3c7d 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_debug.c
+++ b/src/gallium/drivers/radeonsi/si_debug.c
@@ -27,7 +27,6 @@
 #include "si_pipe.h"
 #include "sid.h"
 #include "sid_tables.h"
-#include "radeon/radeon_elf_util.h"
 #include "ddebug/dd_util.h"
 #include "util/u_memory.h"
 #include "ac_debug.h"
@@ -126,7 +125,7 @@ bool si_replace_shader(unsigned num, struct ac_shader_binary *binary)
        if (nread != filesize)
                goto file_error;
 
-       radeon_elf_read(buf, filesize, binary);
+       ac_elf_read(buf, filesize, binary);
        replaced = true;
 
 out_close:

diff --git a/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c b/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c
index 1ae17afbb2d785950b2f44f75fb95190bdec5310..f5c672eee8cfbfba9e6b357d5652771a82aeb208 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c
+++ b/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c
@@ -238,7 +238,7 @@ unsigned si_llvm_compile(LLVMModuleRef M, struct ac_shader_binary *binary,
        buffer_size = LLVMGetBufferSize(out_buffer);
        buffer_data = LLVMGetBufferStart(out_buffer);
 
-       radeon_elf_read(buffer_data, buffer_size, binary);
+       ac_elf_read(buffer_data, buffer_size, binary);
 
        /* Clean up */
        LLVMDisposeMemoryBuffer(out_buffer);