OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

various: Fix missing DumpModule with recent LLVM.

Browse Source 
Since LLVM revision 293359 DumpModule gets only implemented when
either a debug build or LLVM_ENABLE_DUMP is set.

This patch adds a direct replacement for the function for radv and
radeonsi, However, as I don't know a good place to put common LLVM
code for all three I inlined the implementation for LLVMPipe.

v2: Use the new code for LLVM 3.4+ instead of LLVM 5+ & fixed indentation

Signed-off-by: Bas Nieuwenhuizen <basni@google.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
This commit is contained in:
Bas Nieuwenhuizen
2017-01-28 17:32:05 +01:00
parent ce7a045fee
commit 0fca80b3db
5 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/amd/common/ac_llvm_util.c
View File

@@ -504,3 +504,11 @@ ac_prepare_cube_coords(struct ac_llvm_context *ctx,
memcpy(coords_arg, coords, sizeof(coords)); memcpy(coords_arg, coords, sizeof(coords));
} }
void
ac_dump_module(LLVMModuleRef module)
{
char *str = LLVMPrintModuleToString(module);
fprintf(stderr, "%s", str);
LLVMDisposeMessage(str);
}

3
src/amd/common/ac_llvm_util.h
View File

@@ -95,6 +95,9 @@ ac_prepare_cube_coords(struct ac_llvm_context *ctx,
LLVMValueRef *coords_arg, LLVMValueRef *coords_arg,
LLVMValueRef *derivs_arg); LLVMValueRef *derivs_arg);
void
ac_dump_module(LLVMModuleRef module);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

2
src/amd/common/ac_nir_to_llvm.c
View File

@@ -4569,7 +4569,7 @@ static void ac_compile_llvm_module(LLVMTargetMachineRef tm,
bool dump_shader) bool dump_shader)
{ {
if (dump_shader) if (dump_shader)
LLVMDumpModule(llvm_module); ac_dump_module(llvm_module);
memset(binary, 0, sizeof(*binary)); memset(binary, 0, sizeof(*binary));
int v = ac_llvm_compile(llvm_module, binary, tm); int v = ac_llvm_compile(llvm_module, binary, tm);

8
src/gallium/drivers/llvmpipe/lp_jit.c
View File

@@ -222,7 +222,13 @@ lp_jit_create_types(struct lp_fragment_shader_variant *lp)
} }
if (gallivm_debug & GALLIVM_DEBUG_IR) { if (gallivm_debug & GALLIVM_DEBUG_IR) {
LLVMDumpModule(gallivm->module); #if HAVE_LLVM >= 0x304
char *str = LLVMPrintModuleToString(gallivm->module);
fprintf(stderr, "%s", str);
LLVMDisposeMessage(str);
#else
DumpModule(gallivm->module);
#endif
} }
} }

6
src/gallium/drivers/radeonsi/si_shader.c
View File

@@ -6400,7 +6400,7 @@ int si_compile_llvm(struct si_screen *sscreen,
if (!(sscreen->b.debug_flags & (DBG_NO_IR | DBG_PREOPT_IR))) { if (!(sscreen->b.debug_flags & (DBG_NO_IR | DBG_PREOPT_IR))) {
fprintf(stderr, "%s LLVM IR:\n\n", name); fprintf(stderr, "%s LLVM IR:\n\n", name);
LLVMDumpModule(mod); ac_dump_module(mod);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
} }
@@ -6599,7 +6599,7 @@ si_generate_gs_copy_shader(struct si_screen *sscreen,
/* Dump LLVM IR before any optimization passes */ /* Dump LLVM IR before any optimization passes */
if (sscreen->b.debug_flags & DBG_PREOPT_IR && if (sscreen->b.debug_flags & DBG_PREOPT_IR &&
r600_can_dump_shader(&sscreen->b, PIPE_SHADER_GEOMETRY)) r600_can_dump_shader(&sscreen->b, PIPE_SHADER_GEOMETRY))
LLVMDumpModule(bld_base->base.gallivm->module); ac_dump_module(bld_base->base.gallivm->module);
si_llvm_finalize_module(&ctx, si_llvm_finalize_module(&ctx,
r600_extra_shader_checks(&sscreen->b, PIPE_SHADER_GEOMETRY)); r600_extra_shader_checks(&sscreen->b, PIPE_SHADER_GEOMETRY));
@@ -7603,7 +7603,7 @@ int si_compile_tgsi_shader(struct si_screen *sscreen,
/* Dump LLVM IR before any optimization passes */ /* Dump LLVM IR before any optimization passes */
if (sscreen->b.debug_flags & DBG_PREOPT_IR && if (sscreen->b.debug_flags & DBG_PREOPT_IR &&
r600_can_dump_shader(&sscreen->b, ctx.type)) r600_can_dump_shader(&sscreen->b, ctx.type))
LLVMDumpModule(mod); ac_dump_module(mod);
si_llvm_finalize_module(&ctx, si_llvm_finalize_module(&ctx,
r600_extra_shader_checks(&sscreen->b, ctx.type)); r600_extra_shader_checks(&sscreen->b, ctx.type));