st/va: add BOB deinterlacing v2

[mesa.git] / src / gallium / drivers / radeon / radeon_llvm_emit.c

diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.c b/src/gallium/drivers/radeon/radeon_llvm_emit.c
index 00025590137a54a4b2452860ff7aaf67f7fba580..3d0987624a6e3b8a86eb6fea99afffa4f8d9e71c 100644 (file)
--- a/src/gallium/drivers/radeon/radeon_llvm_emit.c
+++ b/src/gallium/drivers/radeon/radeon_llvm_emit.c
@@ -23,10 +23,15 @@
  * Authors: Tom Stellard <thomas.stellard@amd.com>
  *
  */
+
 #include "radeon_llvm_emit.h"
 #include "radeon_elf_util.h"
+#include "c11/threads.h"
+#include "gallivm/lp_bld_misc.h"
+#include "util/u_debug.h"
 #include "util/u_memory.h"
 #include "pipe/p_shader_tokens.h"
+#include "pipe/p_state.h"
 
 #include <llvm-c/Target.h>
 #include <llvm-c/TargetMachine.h>
@@ -86,30 +91,29 @@ void radeon_llvm_shader_type(LLVMValueRef F, unsigned type)
 
 static void init_r600_target()
 {
-       static unsigned initialized = 0;
-       if (!initialized) {
+       gallivm_init_llvm_targets();
 #if HAVE_LLVM < 0x0307
-               LLVMInitializeR600TargetInfo();
-               LLVMInitializeR600Target();
-               LLVMInitializeR600TargetMC();
-               LLVMInitializeR600AsmPrinter();
+       LLVMInitializeR600TargetInfo();
+       LLVMInitializeR600Target();
+       LLVMInitializeR600TargetMC();
+       LLVMInitializeR600AsmPrinter();
 #else
-               LLVMInitializeAMDGPUTargetInfo();
-               LLVMInitializeAMDGPUTarget();
-               LLVMInitializeAMDGPUTargetMC();
-               LLVMInitializeAMDGPUAsmPrinter();
+       LLVMInitializeAMDGPUTargetInfo();
+       LLVMInitializeAMDGPUTarget();
+       LLVMInitializeAMDGPUTargetMC();
+       LLVMInitializeAMDGPUAsmPrinter();
 
 #endif
-               initialized = 1;
-       }
 }
 
+static once_flag init_r600_target_once_flag = ONCE_FLAG_INIT;
+
 LLVMTargetRef radeon_llvm_get_r600_target(const char *triple)
 {
        LLVMTargetRef target = NULL;
        char *err_message = NULL;
 
-       init_r600_target();
+       call_once(&init_r600_target_once_flag, init_r600_target);
 
        if (LLVMGetTargetFromTriple(triple, &target, &err_message)) {
                fprintf(stderr, "Cannot find target for triple %s ", triple);
@@ -122,21 +126,45 @@ LLVMTargetRef radeon_llvm_get_r600_target(const char *triple)
        return target;
 }
 
-#if HAVE_LLVM >= 0x0305
+struct radeon_llvm_diagnostics {
+       struct pipe_debug_callback *debug;
+       unsigned retval;
+};
 
 static void radeonDiagnosticHandler(LLVMDiagnosticInfoRef di, void *context)
 {
-       if (LLVMGetDiagInfoSeverity(di) == LLVMDSError) {
-               unsigned int *diagnosticflag = (unsigned int *)context;
-               char *diaginfo_message = LLVMGetDiagInfoDescription(di);
+       struct radeon_llvm_diagnostics *diag = (struct radeon_llvm_diagnostics *)context;
+       LLVMDiagnosticSeverity severity = LLVMGetDiagInfoSeverity(di);
+       char *description = LLVMGetDiagInfoDescription(di);
+       const char *severity_str = NULL;
+
+       switch (severity) {
+       case LLVMDSError:
+               severity_str = "error";
+               break;
+       case LLVMDSWarning:
+               severity_str = "warning";
+               break;
+       case LLVMDSRemark:
+               severity_str = "remark";
+               break;
+       case LLVMDSNote:
+               severity_str = "note";
+               break;
+       default:
+               severity_str = "unknown";
+       }
+
+       pipe_debug_message(diag->debug, SHADER_INFO,
+                          "LLVM diagnostic (%s): %s", severity_str, description);
 
-               *diagnosticflag = 1;
-               fprintf(stderr,"LLVM triggered Diagnostic Handler: %s\n", diaginfo_message);
-               LLVMDisposeMessage(diaginfo_message);
+       if (severity == LLVMDSError) {
+               diag->retval = 1;
+               fprintf(stderr,"LLVM triggered Diagnostic Handler: %s\n", description);
        }
-}
 
-#endif
+       LLVMDisposeMessage(description);
+}
 
 /**
  * Compile an LLVM module to machine code.
@@ -144,22 +172,25 @@ static void radeonDiagnosticHandler(LLVMDiagnosticInfoRef di, void *context)
  * @returns 0 for success, 1 for failure
  */
 unsigned radeon_llvm_compile(LLVMModuleRef M, struct radeon_shader_binary *binary,
-                            const char *gpu_family, bool dump_ir, bool dump_asm,
-                            LLVMTargetMachineRef tm)
+                            const char *gpu_family,
+                            LLVMTargetMachineRef tm,
+                            struct pipe_debug_callback *debug)
 {
-
+       struct radeon_llvm_diagnostics diag;
        char cpu[CPU_STRING_LEN];
        char fs[FS_STRING_LEN];
        char *err;
        bool dispose_tm = false;
        LLVMContextRef llvm_ctx;
-       unsigned rval = 0;
        LLVMMemoryBufferRef out_buffer;
        unsigned buffer_size;
        const char *buffer_data;
        char triple[TRIPLE_STRING_LEN];
        LLVMBool mem_err;
 
+       diag.debug = debug;
+       diag.retval = 0;
+
        if (!tm) {
                strncpy(triple, "r600--", TRIPLE_STRING_LEN);
                LLVMTargetRef target = radeon_llvm_get_r600_target(triple);
@@ -168,22 +199,17 @@ unsigned radeon_llvm_compile(LLVMModuleRef M, struct radeon_shader_binary *binar
                }
                strncpy(cpu, gpu_family, CPU_STRING_LEN);
                memset(fs, 0, sizeof(fs));
-               if (dump_asm)
-                       strncpy(fs, "+DumpCode", FS_STRING_LEN);
+               strncpy(fs, "+DumpCode", FS_STRING_LEN);
                tm = LLVMCreateTargetMachine(target, triple, cpu, fs,
                                  LLVMCodeGenLevelDefault, LLVMRelocDefault,
                                                  LLVMCodeModelDefault);
                dispose_tm = true;
        }
-       if (dump_ir)
-               LLVMDumpModule(M);
+
        /* Setup Diagnostic Handler*/
        llvm_ctx = LLVMGetModuleContext(M);
 
-#if HAVE_LLVM >= 0x0305
-       LLVMContextSetDiagnosticHandler(llvm_ctx, radeonDiagnosticHandler, &rval);
-#endif
-       rval = 0;
+       LLVMContextSetDiagnosticHandler(llvm_ctx, radeonDiagnosticHandler, &diag);
 
        /* Compile IR*/
        mem_err = LLVMTargetMachineEmitToMemoryBuffer(tm, M, LLVMObjectFile, &err,
@@ -192,13 +218,11 @@ unsigned radeon_llvm_compile(LLVMModuleRef M, struct radeon_shader_binary *binar
        /* Process Errors/Warnings */
        if (mem_err) {
                fprintf(stderr, "%s: %s", __FUNCTION__, err);
+               pipe_debug_message(debug, SHADER_INFO,
+                                  "LLVM emit error: %s", err);
                FREE(err);
-               LLVMDisposeTargetMachine(tm);
-               return 1;
-       }
-
-       if (0 != rval) {
-               fprintf(stderr, "%s: Processing Diag Flag\n", __FUNCTION__);
+               diag.retval = 1;
+               goto out;
        }
 
        /* Extract Shader Code*/
@@ -210,8 +234,11 @@ unsigned radeon_llvm_compile(LLVMModuleRef M, struct radeon_shader_binary *binar
        /* Clean up */
        LLVMDisposeMemoryBuffer(out_buffer);
 
+out:
        if (dispose_tm) {
                LLVMDisposeTargetMachine(tm);
        }
-       return rval;
+       if (diag.retval != 0)
+               pipe_debug_message(debug, SHADER_INFO, "LLVM compile failed");
+       return diag.retval;
 }