gallivm: Add an alternative to LLVMDumpValue that works with Windows GUI apps.
This commit is contained in:
parent
08b3179f48
commit
8ad3e0b55d
|
@ -168,7 +168,8 @@ GALLIVM_SOURCES = \
|
|||
draw/draw_pt_fetch_shade_pipeline_llvm.c \
|
||||
draw/draw_llvm_translate.c
|
||||
|
||||
GALLIVM_CPP_SOURCES =
|
||||
GALLIVM_CPP_SOURCES = \
|
||||
gallivm/lp_bld_misc.cpp
|
||||
|
||||
GENERATED_SOURCES = \
|
||||
indices/u_indices_gen.c \
|
||||
|
|
|
@ -205,6 +205,7 @@ if env['llvm']:
|
|||
'gallivm/lp_bld_intr.c',
|
||||
'gallivm/lp_bld_logic.c',
|
||||
'gallivm/lp_bld_init.c',
|
||||
'gallivm/lp_bld_misc.cpp',
|
||||
'gallivm/lp_bld_pack.c',
|
||||
'gallivm/lp_bld_printf.c',
|
||||
'gallivm/lp_bld_sample.c',
|
||||
|
|
|
@ -205,7 +205,7 @@ draw_llvm_create(struct draw_context *draw)
|
|||
|
||||
|
||||
#if 0
|
||||
LLVMDumpModule(llvm->module);
|
||||
LLVMDumpModule(lp_build_module);
|
||||
#endif
|
||||
|
||||
return llvm;
|
||||
|
@ -691,7 +691,7 @@ draw_llvm_generate(struct draw_llvm *llvm, struct draw_llvm_variant *variant)
|
|||
*/
|
||||
#ifdef DEBUG
|
||||
if(LLVMVerifyFunction(variant->function, LLVMPrintMessageAction)) {
|
||||
LLVMDumpValue(variant->function);
|
||||
lp_debug_dump_value(variant->function);
|
||||
assert(0);
|
||||
}
|
||||
#endif
|
||||
|
@ -699,7 +699,7 @@ draw_llvm_generate(struct draw_llvm *llvm, struct draw_llvm_variant *variant)
|
|||
LLVMRunFunctionPassManager(llvm->pass, variant->function);
|
||||
|
||||
if (0) {
|
||||
LLVMDumpValue(variant->function);
|
||||
lp_debug_dump_value(variant->function);
|
||||
debug_printf("\n");
|
||||
}
|
||||
variant->jit_func = (draw_jit_vert_func)LLVMGetPointerToGlobal(llvm->draw->engine, variant->function);
|
||||
|
@ -842,7 +842,7 @@ draw_llvm_generate_elts(struct draw_llvm *llvm, struct draw_llvm_variant *varian
|
|||
*/
|
||||
#ifdef DEBUG
|
||||
if(LLVMVerifyFunction(variant->function_elts, LLVMPrintMessageAction)) {
|
||||
LLVMDumpValue(variant->function_elts);
|
||||
lp_debug_dump_value(variant->function_elts);
|
||||
assert(0);
|
||||
}
|
||||
#endif
|
||||
|
@ -850,7 +850,7 @@ draw_llvm_generate_elts(struct draw_llvm *llvm, struct draw_llvm_variant *varian
|
|||
LLVMRunFunctionPassManager(llvm->pass, variant->function_elts);
|
||||
|
||||
if (0) {
|
||||
LLVMDumpValue(variant->function_elts);
|
||||
lp_debug_dump_value(variant->function_elts);
|
||||
debug_printf("\n");
|
||||
}
|
||||
variant->jit_func_elts = (draw_jit_vert_func_elts)LLVMGetPointerToGlobal(
|
||||
|
|
|
@ -53,6 +53,10 @@ lp_build_name(LLVMValueRef val, const char *format, ...)
|
|||
}
|
||||
|
||||
|
||||
void
|
||||
lp_debug_dump_value(LLVMValueRef value);
|
||||
|
||||
|
||||
boolean
|
||||
lp_check_alignment(const void *ptr, unsigned alignment);
|
||||
|
||||
|
|
|
@ -0,0 +1,98 @@
|
|||
/**************************************************************************
|
||||
*
|
||||
* Copyright 2010 VMware, Inc.
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* 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, sub license, 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 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 NON-INFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS 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.
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the
|
||||
* next paragraph) shall be included in all copies or substantial portions
|
||||
* of the Software.
|
||||
*
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
#ifndef __STDC_LIMIT_MACROS
|
||||
#define __STDC_LIMIT_MACROS
|
||||
#endif
|
||||
|
||||
#ifndef __STDC_CONSTANT_MACROS
|
||||
#define __STDC_CONSTANT_MACROS
|
||||
#endif
|
||||
|
||||
#include "llvm/Support/raw_ostream.h"
|
||||
#include "llvm-c/Core.h"
|
||||
|
||||
#include "util/u_debug.h"
|
||||
|
||||
|
||||
#if defined(PIPE_OS_WINDOWS) || defined(PIPE_OS_EMBDDED)
|
||||
|
||||
class raw_debug_ostream :
|
||||
public llvm::raw_ostream
|
||||
{
|
||||
uint64_t pos;
|
||||
|
||||
void write_impl(const char *Ptr, size_t Size);
|
||||
uint64_t current_pos() { return pos; }
|
||||
uint64_t current_pos() const { return pos; }
|
||||
|
||||
#if HAVE_LLVM >= 0x207
|
||||
uint64_t preferred_buffer_size() { return 512; }
|
||||
#else
|
||||
size_t preferred_buffer_size() { return 512; }
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
void
|
||||
raw_debug_ostream::write_impl(const char *Ptr, size_t Size)
|
||||
{
|
||||
if (Size > 0) {
|
||||
char *lastPtr = (char *)&Ptr[Size];
|
||||
char last = *lastPtr;
|
||||
*lastPtr = 0;
|
||||
_debug_printf("%*s", Size, Ptr);
|
||||
*lastPtr = last;
|
||||
pos += Size;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Same as LLVMDumpValue, but through our debugging channels.
|
||||
*/
|
||||
extern "C" void
|
||||
lp_debug_dump_value(LLVMValueRef value)
|
||||
{
|
||||
raw_debug_ostream os;
|
||||
llvm::unwrap(value)->print(os);
|
||||
os.flush();
|
||||
}
|
||||
|
||||
|
||||
#else
|
||||
|
||||
|
||||
extern "C" void
|
||||
lp_debug_dump_value(LLVMValueRef value)
|
||||
{
|
||||
LLVMDumpValue(value);
|
||||
}
|
||||
|
||||
|
||||
#endif
|
|
@ -1953,7 +1953,7 @@ lp_build_tgsi_soa(LLVMBuilderRef builder,
|
|||
LLVMValueRef function = LLVMGetBasicBlockParent(block);
|
||||
debug_printf("11111111111111111111111111111 \n");
|
||||
tgsi_dump(tokens, 0);
|
||||
LLVMDumpValue(function);
|
||||
lp_debug_dump_value(function);
|
||||
debug_printf("2222222222222222222222222222 \n");
|
||||
}
|
||||
tgsi_parse_free( &parse );
|
||||
|
|
|
@ -851,7 +851,7 @@ generate_fragment(struct llvmpipe_context *lp,
|
|||
#ifdef DEBUG
|
||||
if(LLVMVerifyFunction(function, LLVMPrintMessageAction)) {
|
||||
if (1)
|
||||
LLVMDumpValue(function);
|
||||
lp_debug_dump_value(function);
|
||||
abort();
|
||||
}
|
||||
#endif
|
||||
|
@ -862,7 +862,7 @@ generate_fragment(struct llvmpipe_context *lp,
|
|||
|
||||
if (LP_DEBUG & DEBUG_JIT) {
|
||||
/* Print the LLVM IR to stderr */
|
||||
LLVMDumpValue(function);
|
||||
lp_debug_dump_value(function);
|
||||
debug_printf("\n");
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue