KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gallivm: Remove lp_get_module_id. 

Just keep a copy of the module_name in gallivm.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
This commit is contained in:
Jose Fonseca 2016-04-15 11:27:02 +01:00
parent 969ba8bfa7
commit b5ca689cee
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
View File

@ -65,13 +65,6 @@ lp_check_alignment(const void *ptr, unsigned alignment)
}
extern "C" const char *
lp_get_module_id(LLVMModuleRef module)
{
return llvm::unwrap(module)->getModuleIdentifier().c_str();
}
/**
* Same as LLVMDumpValue, but through our debugging channels.
*/

4
src/gallium/auxiliary/gallivm/lp_bld_debug.h
View File

@ -76,10 +76,6 @@ lp_build_name(LLVMValueRef val, const char *format, ...)
}
const char *
lp_get_module_id(LLVMModuleRef module);
void
lp_debug_dump_value(LLVMValueRef value);

15
src/gallium/auxiliary/gallivm/lp_bld_init.c
View File

@ -187,6 +187,8 @@ gallivm_free_ir(struct gallivm_state *gallivm)
LLVMDisposeModule(gallivm->module);
}
FREE(gallivm->module_name);
if (!USE_MCJIT) {
/* Don't free the TargetData, it's owned by the exec engine */
} else {
@ -203,6 +205,7 @@ gallivm_free_ir(struct gallivm_state *gallivm)
gallivm->engine = NULL;
gallivm->target = NULL;
gallivm->module = NULL;
gallivm->module_name = NULL;
gallivm->passmgr = NULL;
gallivm->context = NULL;
gallivm->builder = NULL;
@ -306,6 +309,15 @@ init_gallivm_state(struct gallivm_state *gallivm, const char *name,
if (!gallivm->context)
goto fail;
gallivm->module_name = NULL;
if (name) {
size_t size = strlen(name) + 1;
gallivm->module_name = MALLOC(size);
if (gallivm->module_name) {
memcpy(gallivm->module_name, name, size);
}
}
gallivm->module = LLVMModuleCreateWithNameInContext(name,
gallivm->context);
if (!gallivm->module)
@ -574,8 +586,9 @@ gallivm_compile_module(struct gallivm_state *gallivm)
if (gallivm_debug & GALLIVM_DEBUG_PERF) {
int64_t time_end = os_time_get();
int time_msec = (int)(time_end - time_begin) / 1000;
assert(gallivm->module_name);
debug_printf("optimizing module %s took %d msec\n",
lp_get_module_id(gallivm->module), time_msec);
gallivm->module_name, time_msec);
}
/* Dump byte code to a file */

1
src/gallium/auxiliary/gallivm/lp_bld_init.h
View File

@ -41,6 +41,7 @@ extern "C" {
struct gallivm_state
{
char *module_name;
LLVMModuleRef module;
LLVMExecutionEngineRef engine;
LLVMTargetDataRef target;