radeonsi: split si_clear_buffer to remove enum si_method
[mesa.git] / src / gallium / drivers / radeonsi / si_shader_tgsi_setup.c
index e965fa7c415ec1d3cddd6089ff0a6595b9077b8c..975696d07ad6c4473d05b52598cfe734da71f0c2 100644 (file)
@@ -1,5 +1,6 @@
 /*
  * Copyright 2016 Advanced Micro Devices, 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"),
 
 #include "si_shader_internal.h"
 #include "si_pipe.h"
-
-#include "gallivm/lp_bld_const.h"
-#include "gallivm/lp_bld_gather.h"
-#include "gallivm/lp_bld_flow.h"
-#include "gallivm/lp_bld_init.h"
-#include "gallivm/lp_bld_intr.h"
-#include "gallivm/lp_bld_misc.h"
-#include "gallivm/lp_bld_swizzle.h"
-#include "tgsi/tgsi_info.h"
-#include "tgsi/tgsi_parse.h"
-#include "util/u_math.h"
+#include "ac_llvm_util.h"
 #include "util/u_memory.h"
-#include "util/u_debug.h"
-
-#include <stdio.h>
-#include <llvm-c/Transforms/IPO.h>
-#include <llvm-c/Transforms/Scalar.h>
-
-/* Data for if/else/endif and bgnloop/endloop control flow structures.
- */
-struct si_llvm_flow {
-       /* Loop exit or next part of if/else/endif. */
-       LLVMBasicBlockRef next_block;
-       LLVMBasicBlockRef loop_entry_block;
-};
 
 enum si_llvm_calling_convention {
        RADEON_LLVM_AMDGPU_VS = 87,
@@ -57,14 +35,6 @@ enum si_llvm_calling_convention {
        RADEON_LLVM_AMDGPU_HS = 93,
 };
 
-void si_llvm_add_attribute(LLVMValueRef F, const char *name, int value)
-{
-       char str[16];
-
-       snprintf(str, sizeof(str), "%i", value);
-       LLVMAddTargetDependentFunctionAttr(F, name, str);
-}
-
 struct si_llvm_diagnostics {
        struct pipe_debug_callback *debug;
        unsigned retval;
@@ -111,16 +81,15 @@ static void si_diagnostic_handler(LLVMDiagnosticInfoRef di, void *context)
  * @returns 0 for success, 1 for failure
  */
 unsigned si_llvm_compile(LLVMModuleRef M, struct ac_shader_binary *binary,
-                        LLVMTargetMachineRef tm,
-                        struct pipe_debug_callback *debug)
+                        struct ac_llvm_compiler *compiler,
+                        struct pipe_debug_callback *debug,
+                        bool less_optimized)
 {
+       struct ac_compiler_passes *passes =
+               less_optimized && compiler->low_opt_passes ?
+                       compiler->low_opt_passes : compiler->passes;
        struct si_llvm_diagnostics diag;
-       char *err;
        LLVMContextRef llvm_ctx;
-       LLVMMemoryBufferRef out_buffer;
-       unsigned buffer_size;
-       const char *buffer_data;
-       LLVMBool mem_err;
 
        diag.debug = debug;
        diag.retval = 0;
@@ -130,33 +99,10 @@ unsigned si_llvm_compile(LLVMModuleRef M, struct ac_shader_binary *binary,
 
        LLVMContextSetDiagnosticHandler(llvm_ctx, si_diagnostic_handler, &diag);
 
-       /* Compile IR*/
-       mem_err = LLVMTargetMachineEmitToMemoryBuffer(tm, M, LLVMObjectFile, &err,
-                                                                &out_buffer);
-
-       /* 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);
+       /* Compile IR. */
+       if (!ac_compile_module_to_binary(passes, M, binary))
                diag.retval = 1;
-               goto out;
-       }
-
-       /* Extract Shader Code*/
-       buffer_size = LLVMGetBufferSize(out_buffer);
-       buffer_data = LLVMGetBufferStart(out_buffer);
 
-       if (!ac_elf_read(buffer_data, buffer_size, binary)) {
-               fprintf(stderr, "radeonsi: cannot read an ELF shader binary\n");
-               diag.retval = 1;
-       }
-
-       /* Clean up */
-       LLVMDisposeMemoryBuffer(out_buffer);
-
-out:
        if (diag.retval != 0)
                pipe_debug_message(debug, SHADER_INFO, "LLVM compile failed");
        return diag.retval;
@@ -208,7 +154,7 @@ LLVMValueRef si_llvm_bound_index(struct si_shader_context *ctx,
        LLVMValueRef c_max = LLVMConstInt(ctx->i32, num - 1, 0);
        LLVMValueRef cc;
 
-       if (util_is_power_of_two(num)) {
+       if (util_is_power_of_two_or_zero(num)) {
                index = LLVMBuildAnd(builder, index, c_max, "");
        } else {
                /* In theory, this MAX pattern should result in code that is
@@ -224,45 +170,6 @@ LLVMValueRef si_llvm_bound_index(struct si_shader_context *ctx,
        return index;
 }
 
-static struct si_llvm_flow *
-get_current_flow(struct si_shader_context *ctx)
-{
-       if (ctx->flow_depth > 0)
-               return &ctx->flow[ctx->flow_depth - 1];
-       return NULL;
-}
-
-static struct si_llvm_flow *
-get_innermost_loop(struct si_shader_context *ctx)
-{
-       for (unsigned i = ctx->flow_depth; i > 0; --i) {
-               if (ctx->flow[i - 1].loop_entry_block)
-                       return &ctx->flow[i - 1];
-       }
-       return NULL;
-}
-
-static struct si_llvm_flow *
-push_flow(struct si_shader_context *ctx)
-{
-       struct si_llvm_flow *flow;
-
-       if (ctx->flow_depth >= ctx->flow_depth_max) {
-               unsigned new_max = MAX2(ctx->flow_depth << 1, RADEON_LLVM_INITIAL_CF_DEPTH);
-               ctx->flow = REALLOC(ctx->flow,
-                                   ctx->flow_depth_max * sizeof(*ctx->flow),
-                                   new_max * sizeof(*ctx->flow));
-               ctx->flow_depth_max = new_max;
-       }
-
-       flow = &ctx->flow[ctx->flow_depth];
-       ctx->flow_depth++;
-
-       flow->next_block = NULL;
-       flow->loop_entry_block = NULL;
-       return flow;
-}
-
 static LLVMValueRef emit_swizzle(struct lp_build_tgsi_context *bld_base,
                                 LLVMValueRef value,
                                 unsigned swizzle_x,
@@ -399,7 +306,7 @@ get_pointer_into_array(struct si_shader_context *ctx,
 
 LLVMValueRef
 si_llvm_emit_fetch_64bit(struct lp_build_tgsi_context *bld_base,
-                        enum tgsi_opcode_type type,
+                        LLVMTypeRef type,
                         LLVMValueRef ptr,
                         LLVMValueRef ptr2)
 {
@@ -416,7 +323,7 @@ si_llvm_emit_fetch_64bit(struct lp_build_tgsi_context *bld_base,
                                        result,
                                        ac_to_integer(&ctx->ac, ptr2),
                                        ctx->i32_1, "");
-       return bitcast(bld_base, type, result);
+       return LLVMBuildBitCast(ctx->ac.builder, result, type, "");
 }
 
 static LLVMValueRef
@@ -461,7 +368,8 @@ load_value_from_array(struct lp_build_tgsi_context *bld_base,
                        LLVMValueRef ptr_hi, val_hi;
                        ptr_hi = LLVMBuildGEP(builder, ptr, &ctx->i32_1, 1, "");
                        val_hi = LLVMBuildLoad(builder, ptr_hi, "");
-                       val = si_llvm_emit_fetch_64bit(bld_base, type, val, val_hi);
+                       val = si_llvm_emit_fetch_64bit(bld_base, tgsi2llvmtype(bld_base, type),
+                                                      val, val_hi);
                }
 
                return val;
@@ -562,7 +470,7 @@ LLVMValueRef si_llvm_emit_fetch(struct lp_build_tgsi_context *bld_base,
                for (chan = 0; chan < TGSI_NUM_CHANNELS; chan++) {
                        values[chan] = si_llvm_emit_fetch(bld_base, reg, type, chan);
                }
-               return lp_build_gather_values(&ctx->gallivm, values,
+               return ac_build_gather_values(&ctx->ac, values,
                                              TGSI_NUM_CHANNELS);
        }
 
@@ -609,7 +517,8 @@ LLVMValueRef si_llvm_emit_fetch(struct lp_build_tgsi_context *bld_base,
                if (tgsi_type_is_64bit(type)) {
                        ptr = result;
                        ptr2 = input[swizzle + 1];
-                       return si_llvm_emit_fetch_64bit(bld_base, type, ptr, ptr2);
+                       return si_llvm_emit_fetch_64bit(bld_base, tgsi2llvmtype(bld_base, type),
+                                                       ptr, ptr2);
                }
                break;
        }
@@ -620,7 +529,7 @@ LLVMValueRef si_llvm_emit_fetch(struct lp_build_tgsi_context *bld_base,
                ptr = ctx->temps[reg->Register.Index * TGSI_NUM_CHANNELS + swizzle];
                if (tgsi_type_is_64bit(type)) {
                        ptr2 = ctx->temps[reg->Register.Index * TGSI_NUM_CHANNELS + swizzle + 1];
-                       return si_llvm_emit_fetch_64bit(bld_base, type,
+                       return si_llvm_emit_fetch_64bit(bld_base, tgsi2llvmtype(bld_base, type),
                                                        LLVMBuildLoad(builder, ptr, ""),
                                                        LLVMBuildLoad(builder, ptr2, ""));
                }
@@ -631,7 +540,7 @@ LLVMValueRef si_llvm_emit_fetch(struct lp_build_tgsi_context *bld_base,
                ptr = get_output_ptr(bld_base, reg->Register.Index, swizzle);
                if (tgsi_type_is_64bit(type)) {
                        ptr2 = get_output_ptr(bld_base, reg->Register.Index, swizzle + 1);
-                       return si_llvm_emit_fetch_64bit(bld_base, type,
+                       return si_llvm_emit_fetch_64bit(bld_base, tgsi2llvmtype(bld_base, type),
                                                        LLVMBuildLoad(builder, ptr, ""),
                                                        LLVMBuildLoad(builder, ptr2, ""));
                }
@@ -664,7 +573,8 @@ static LLVMValueRef fetch_system_value(struct lp_build_tgsi_context *bld_base,
                hi = LLVMBuildExtractElement(
                        builder, cval, LLVMConstInt(ctx->i32, swizzle + 1, 0), "");
 
-               return si_llvm_emit_fetch_64bit(bld_base, type, lo, hi);
+               return si_llvm_emit_fetch_64bit(bld_base, tgsi2llvmtype(bld_base, type),
+                                               lo, hi);
        }
 
        if (LLVMGetTypeKind(LLVMTypeOf(cval)) == LLVMVectorTypeKind) {
@@ -690,9 +600,8 @@ static void emit_declaration(struct lp_build_tgsi_context *bld_base,
                for (idx = decl->Range.First; idx <= decl->Range.Last; idx++) {
                        unsigned chan;
                        for (chan = 0; chan < TGSI_NUM_CHANNELS; chan++) {
-                                ctx->addrs[idx][chan] = lp_build_alloca_undef(
-                                       &ctx->gallivm,
-                                       ctx->i32, "");
+                                ctx->addrs[idx][chan] = ac_build_alloca_undef(
+                                       &ctx->ac, ctx->i32, "");
                        }
                }
                break;
@@ -700,7 +609,7 @@ static void emit_declaration(struct lp_build_tgsi_context *bld_base,
 
        case TGSI_FILE_TEMPORARY:
        {
-               char name[16] = "";
+               char name[18] = "";
                LLVMValueRef array_alloca = NULL;
                unsigned decl_size;
                unsigned writemask = decl->Declaration.UsageMask;
@@ -737,7 +646,7 @@ static void emit_declaration(struct lp_build_tgsi_context *bld_base,
                         */
                        if (array_size > 16 ||
                            !ctx->screen->llvm_has_working_vgpr_indexing) {
-                               array_alloca = lp_build_alloca_undef(&ctx->gallivm,
+                               array_alloca = ac_build_alloca_undef(&ctx->ac,
                                        LLVMArrayType(ctx->f32,
                                                      array_size), "array");
                                ctx->temp_array_allocas[id] = array_alloca;
@@ -755,7 +664,7 @@ static void emit_declaration(struct lp_build_tgsi_context *bld_base,
                                         first + i / 4, "xyzw"[i % 4]);
 #endif
                                ctx->temps[first * TGSI_NUM_CHANNELS + i] =
-                                       lp_build_alloca_undef(&ctx->gallivm,
+                                       ac_build_alloca_undef(&ctx->ac,
                                                              ctx->f32,
                                                              name);
                        }
@@ -773,9 +682,8 @@ static void emit_declaration(struct lp_build_tgsi_context *bld_base,
                                 * a shader ever reads from a channel that
                                 * it never writes to.
                                 */
-                               ctx->undef_alloca = lp_build_alloca_undef(
-                                       &ctx->gallivm,
-                                       ctx->f32, "undef");
+                               ctx->undef_alloca = ac_build_alloca_undef(
+                                       &ctx->ac, ctx->f32, "undef");
                        }
 
                        for (i = 0; i < decl_size; ++i) {
@@ -839,16 +747,15 @@ static void emit_declaration(struct lp_build_tgsi_context *bld_base,
                                snprintf(name, sizeof(name), "OUT%d.%c",
                                         idx, "xyzw"[chan % 4]);
 #endif
-                               ctx->outputs[idx][chan] = lp_build_alloca_undef(
-                                       &ctx->gallivm,
-                                       ctx->f32, name);
+                               ctx->outputs[idx][chan] = ac_build_alloca_undef(
+                                       &ctx->ac, ctx->f32, name);
                        }
                }
                break;
        }
 
        case TGSI_FILE_MEMORY:
-               si_declare_compute_memory(ctx, decl);
+               si_tgsi_declare_compute_memory(ctx, decl);
                break;
 
        default:
@@ -951,42 +858,13 @@ void si_llvm_emit_store(struct lp_build_tgsi_context *bld_base,
        }
 }
 
-static void set_basicblock_name(LLVMBasicBlockRef bb, const char *base, int pc)
+static int get_line(int pc)
 {
-       char buf[32];
        /* Subtract 1 so that the number shown is that of the corresponding
         * opcode in the TGSI dump, e.g. an if block has the same suffix as
         * the instruction number of the corresponding TGSI IF.
         */
-       snprintf(buf, sizeof(buf), "%s%d", base, pc - 1);
-       LLVMSetValueName(LLVMBasicBlockAsValue(bb), buf);
-}
-
-/* Append a basic block at the level of the parent flow.
- */
-static LLVMBasicBlockRef append_basic_block(struct si_shader_context *ctx,
-                                           const char *name)
-{
-       assert(ctx->flow_depth >= 1);
-
-       if (ctx->flow_depth >= 2) {
-               struct si_llvm_flow *flow = &ctx->flow[ctx->flow_depth - 2];
-
-               return LLVMInsertBasicBlockInContext(ctx->ac.context,
-                                                    flow->next_block, name);
-       }
-
-       return LLVMAppendBasicBlockInContext(ctx->ac.context, ctx->main_fn, name);
-}
-
-/* Emit a branch to the given default target for the current block if
- * applicable -- that is, if the current block does not already contain a
- * branch from a break or continue.
- */
-static void emit_default_branch(LLVMBuilderRef builder, LLVMBasicBlockRef target)
-{
-       if (!LLVMGetBasicBlockTerminator(LLVMGetInsertBlock(builder)))
-                LLVMBuildBr(builder, target);
+       return pc - 1;
 }
 
 static void bgnloop_emit(const struct lp_build_tgsi_action *action,
@@ -994,12 +872,7 @@ static void bgnloop_emit(const struct lp_build_tgsi_action *action,
                         struct lp_build_emit_data *emit_data)
 {
        struct si_shader_context *ctx = si_shader_context(bld_base);
-       struct si_llvm_flow *flow = push_flow(ctx);
-       flow->loop_entry_block = append_basic_block(ctx, "LOOP");
-       flow->next_block = append_basic_block(ctx, "ENDLOOP");
-       set_basicblock_name(flow->loop_entry_block, "loop", bld_base->pc);
-       LLVMBuildBr(ctx->ac.builder, flow->loop_entry_block);
-       LLVMPositionBuilderAtEnd(ctx->ac.builder, flow->loop_entry_block);
+       ac_build_bgnloop(&ctx->ac, get_line(bld_base->pc));
 }
 
 static void brk_emit(const struct lp_build_tgsi_action *action,
@@ -1007,9 +880,7 @@ static void brk_emit(const struct lp_build_tgsi_action *action,
                     struct lp_build_emit_data *emit_data)
 {
        struct si_shader_context *ctx = si_shader_context(bld_base);
-       struct si_llvm_flow *flow = get_innermost_loop(ctx);
-
-       LLVMBuildBr(ctx->ac.builder, flow->next_block);
+       ac_build_break(&ctx->ac);
 }
 
 static void cont_emit(const struct lp_build_tgsi_action *action,
@@ -1017,9 +888,7 @@ static void cont_emit(const struct lp_build_tgsi_action *action,
                      struct lp_build_emit_data *emit_data)
 {
        struct si_shader_context *ctx = si_shader_context(bld_base);
-       struct si_llvm_flow *flow = get_innermost_loop(ctx);
-
-       LLVMBuildBr(ctx->ac.builder, flow->loop_entry_block);
+       ac_build_continue(&ctx->ac);
 }
 
 static void else_emit(const struct lp_build_tgsi_action *action,
@@ -1027,18 +896,7 @@ static void else_emit(const struct lp_build_tgsi_action *action,
                      struct lp_build_emit_data *emit_data)
 {
        struct si_shader_context *ctx = si_shader_context(bld_base);
-       struct si_llvm_flow *current_branch = get_current_flow(ctx);
-       LLVMBasicBlockRef endif_block;
-
-       assert(!current_branch->loop_entry_block);
-
-       endif_block = append_basic_block(ctx, "ENDIF");
-       emit_default_branch(ctx->ac.builder, endif_block);
-
-       LLVMPositionBuilderAtEnd(ctx->ac.builder, current_branch->next_block);
-       set_basicblock_name(current_branch->next_block, "else", bld_base->pc);
-
-       current_branch->next_block = endif_block;
+       ac_build_else(&ctx->ac, get_line(bld_base->pc));
 }
 
 static void endif_emit(const struct lp_build_tgsi_action *action,
@@ -1046,15 +904,7 @@ static void endif_emit(const struct lp_build_tgsi_action *action,
                       struct lp_build_emit_data *emit_data)
 {
        struct si_shader_context *ctx = si_shader_context(bld_base);
-       struct si_llvm_flow *current_branch = get_current_flow(ctx);
-
-       assert(!current_branch->loop_entry_block);
-
-       emit_default_branch(ctx->ac.builder, current_branch->next_block);
-       LLVMPositionBuilderAtEnd(ctx->ac.builder, current_branch->next_block);
-       set_basicblock_name(current_branch->next_block, "endif", bld_base->pc);
-
-       ctx->flow_depth--;
+       ac_build_endif(&ctx->ac, get_line(bld_base->pc));
 }
 
 static void endloop_emit(const struct lp_build_tgsi_action *action,
@@ -1062,31 +912,7 @@ static void endloop_emit(const struct lp_build_tgsi_action *action,
                         struct lp_build_emit_data *emit_data)
 {
        struct si_shader_context *ctx = si_shader_context(bld_base);
-       struct si_llvm_flow *current_loop = get_current_flow(ctx);
-
-       assert(current_loop->loop_entry_block);
-
-       emit_default_branch(ctx->ac.builder, current_loop->loop_entry_block);
-
-       LLVMPositionBuilderAtEnd(ctx->ac.builder, current_loop->next_block);
-       set_basicblock_name(current_loop->next_block, "endloop", bld_base->pc);
-       ctx->flow_depth--;
-}
-
-static void if_cond_emit(const struct lp_build_tgsi_action *action,
-                        struct lp_build_tgsi_context *bld_base,
-                        struct lp_build_emit_data *emit_data,
-                        LLVMValueRef cond)
-{
-       struct si_shader_context *ctx = si_shader_context(bld_base);
-       struct si_llvm_flow *flow = push_flow(ctx);
-       LLVMBasicBlockRef if_block;
-
-       if_block = append_basic_block(ctx, "IF");
-       flow->next_block = append_basic_block(ctx, "ELSE");
-       set_basicblock_name(if_block, "if", bld_base->pc);
-       LLVMBuildCondBr(ctx->ac.builder, cond, if_block, flow->next_block);
-       LLVMPositionBuilderAtEnd(ctx->ac.builder, if_block);
+       ac_build_endloop(&ctx->ac, get_line(bld_base->pc));
 }
 
 static void if_emit(const struct lp_build_tgsi_action *action,
@@ -1094,13 +920,7 @@ static void if_emit(const struct lp_build_tgsi_action *action,
                    struct lp_build_emit_data *emit_data)
 {
        struct si_shader_context *ctx = si_shader_context(bld_base);
-       LLVMValueRef cond;
-
-       cond = LLVMBuildFCmp(ctx->ac.builder, LLVMRealUNE,
-                       emit_data->args[0],
-                       ctx->ac.f32_0, "");
-
-       if_cond_emit(action, bld_base, emit_data, cond);
+       ac_build_if(&ctx->ac, emit_data->args[0], get_line(bld_base->pc));
 }
 
 static void uif_emit(const struct lp_build_tgsi_action *action,
@@ -1108,12 +928,7 @@ static void uif_emit(const struct lp_build_tgsi_action *action,
                     struct lp_build_emit_data *emit_data)
 {
        struct si_shader_context *ctx = si_shader_context(bld_base);
-       LLVMValueRef cond;
-
-       cond = LLVMBuildICmp(ctx->ac.builder, LLVMIntNE,
-               ac_to_integer(&ctx->ac, emit_data->args[0]), ctx->i32_0, "");
-
-       if_cond_emit(action, bld_base, emit_data, cond);
+       ac_build_uif(&ctx->ac, emit_data->args[0], get_line(bld_base->pc));
 }
 
 static void emit_immediate(struct lp_build_tgsi_context *bld_base,
@@ -1132,7 +947,7 @@ static void emit_immediate(struct lp_build_tgsi_context *bld_base,
 
 void si_llvm_context_init(struct si_shader_context *ctx,
                          struct si_screen *sscreen,
-                         LLVMTargetMachineRef tm)
+                         struct ac_llvm_compiler *compiler)
 {
        struct lp_type type;
 
@@ -1143,30 +958,20 @@ void si_llvm_context_init(struct si_shader_context *ctx,
         */
        memset(ctx, 0, sizeof(*ctx));
        ctx->screen = sscreen;
-       ctx->tm = tm;
-
-       ctx->gallivm.context = LLVMContextCreate();
-       ctx->gallivm.module = LLVMModuleCreateWithNameInContext("tgsi",
-                                               ctx->gallivm.context);
-       LLVMSetTarget(ctx->gallivm.module, "amdgcn--");
+       ctx->compiler = compiler;
 
-       LLVMTargetDataRef data_layout = LLVMCreateTargetDataLayout(tm);
-       char *data_layout_str = LLVMCopyStringRepOfTargetData(data_layout);
-       LLVMSetDataLayout(ctx->gallivm.module, data_layout_str);
-       LLVMDisposeTargetData(data_layout);
-       LLVMDisposeMessage(data_layout_str);
+       ac_llvm_context_init(&ctx->ac, sscreen->info.chip_class, sscreen->info.family);
+       ctx->ac.module = ac_create_module(compiler->tm, ctx->ac.context);
 
-       bool unsafe_fpmath = (sscreen->debug_flags & DBG(UNSAFE_MATH)) != 0;
-       enum lp_float_mode float_mode =
-               unsafe_fpmath ? LP_FLOAT_MODE_UNSAFE_FP_MATH :
-                               LP_FLOAT_MODE_NO_SIGNED_ZEROS_FP_MATH;
+       enum ac_float_mode float_mode =
+               sscreen->debug_flags & DBG(UNSAFE_MATH) ?
+                       AC_FLOAT_MODE_UNSAFE_FP_MATH :
+                       AC_FLOAT_MODE_NO_SIGNED_ZEROS_FP_MATH;
+       ctx->ac.builder = ac_create_builder(ctx->ac.context, float_mode);
 
-       ctx->gallivm.builder = lp_create_builder(ctx->gallivm.context,
-                                                float_mode);
-
-       ac_llvm_context_init(&ctx->ac, ctx->gallivm.context, sscreen->info.chip_class);
-       ctx->ac.module = ctx->gallivm.module;
-       ctx->ac.builder = ctx->gallivm.builder;
+       ctx->gallivm.context = ctx->ac.context;
+       ctx->gallivm.module = ctx->ac.module;
+       ctx->gallivm.builder = ctx->ac.builder;
 
        struct lp_build_tgsi_context *bld_base = &ctx->bld_base;
 
@@ -1190,13 +995,6 @@ void si_llvm_context_init(struct si_shader_context *ctx,
        bld_base->emit_declaration = emit_declaration;
        bld_base->emit_immediate = emit_immediate;
 
-       /* metadata allowing 2.5 ULP */
-       ctx->fpmath_md_kind = LLVMGetMDKindIDInContext(ctx->ac.context,
-                                                      "fpmath", 6);
-       LLVMValueRef arg = LLVMConstReal(ctx->ac.f32, 2.5);
-       ctx->fpmath_md_2p5_ulp = LLVMMDNodeInContext(ctx->ac.context,
-                                                    &arg, 1);
-
        bld_base->op_actions[TGSI_OPCODE_BGNLOOP].emit = bgnloop_emit;
        bld_base->op_actions[TGSI_OPCODE_BRK].emit = brk_emit;
        bld_base->op_actions[TGSI_OPCODE_CONT].emit = cont_emit;
@@ -1223,6 +1021,8 @@ void si_llvm_context_init(struct si_shader_context *ctx,
 
        ctx->i32_0 = LLVMConstInt(ctx->i32, 0, 0);
        ctx->i32_1 = LLVMConstInt(ctx->i32, 1, 0);
+       ctx->i1false = LLVMConstInt(ctx->i1, 0, 0);
+       ctx->i1true = LLVMConstInt(ctx->i1, 1, 0);
 }
 
 /* Set the context to a certain TGSI shader. Can be called repeatedly
@@ -1256,7 +1056,16 @@ void si_llvm_context_set_tgsi(struct si_shader_context *ctx,
        ctx->temps = NULL;
        ctx->temps_count = 0;
 
-       if (!info || !tokens)
+       if (!info)
+               return;
+
+       ctx->num_const_buffers = util_last_bit(info->const_buffers_declared);
+       ctx->num_shader_buffers = util_last_bit(info->shader_buffers_declared);
+
+       ctx->num_samplers = util_last_bit(info->samplers_declared);
+       ctx->num_images = util_last_bit(info->images_declared);
+
+       if (!tokens)
                return;
 
        if (info->array_max[TGSI_FILE_TEMPORARY] > 0) {
@@ -1284,11 +1093,6 @@ void si_llvm_context_set_tgsi(struct si_shader_context *ctx,
        ctx->bld_base.emit_fetch_funcs[TGSI_FILE_TEMPORARY] = si_llvm_emit_fetch;
        ctx->bld_base.emit_fetch_funcs[TGSI_FILE_OUTPUT] = si_llvm_emit_fetch;
        ctx->bld_base.emit_fetch_funcs[TGSI_FILE_SYSTEM_VALUE] = fetch_system_value;
-
-       ctx->num_const_buffers = util_last_bit(info->const_buffers_declared);
-       ctx->num_shader_buffers = util_last_bit(info->shader_buffers_declared);
-       ctx->num_samplers = util_last_bit(info->samplers_declared);
-       ctx->num_images = util_last_bit(info->images_declared);
 }
 
 void si_llvm_create_func(struct si_shader_context *ctx,
@@ -1332,8 +1136,7 @@ void si_llvm_create_func(struct si_shader_context *ctx,
                call_conv = RADEON_LLVM_AMDGPU_VS;
                break;
        case PIPE_SHADER_TESS_CTRL:
-               call_conv = HAVE_LLVM >= 0x0500 ? RADEON_LLVM_AMDGPU_HS :
-                                                 RADEON_LLVM_AMDGPU_VS;
+               call_conv = RADEON_LLVM_AMDGPU_HS;
                break;
        case PIPE_SHADER_GEOMETRY:
                call_conv = RADEON_LLVM_AMDGPU_GS;
@@ -1353,46 +1156,14 @@ void si_llvm_create_func(struct si_shader_context *ctx,
 
 void si_llvm_optimize_module(struct si_shader_context *ctx)
 {
-       struct gallivm_state *gallivm = &ctx->gallivm;
-       const char *triple = LLVMGetTarget(gallivm->module);
-       LLVMTargetLibraryInfoRef target_library_info;
-
        /* Dump LLVM IR before any optimization passes */
        if (ctx->screen->debug_flags & DBG(PREOPT_IR) &&
            si_can_dump_shader(ctx->screen, ctx->type))
                LLVMDumpModule(ctx->gallivm.module);
 
-       /* Create the pass manager */
-       gallivm->passmgr = LLVMCreatePassManager();
-
-       target_library_info = gallivm_create_target_library_info(triple);
-       LLVMAddTargetLibraryInfo(target_library_info, gallivm->passmgr);
-
-       if (si_extra_shader_checks(ctx->screen, ctx->type))
-               LLVMAddVerifierPass(gallivm->passmgr);
-
-       LLVMAddAlwaysInlinerPass(gallivm->passmgr);
-
-       /* This pass should eliminate all the load and store instructions */
-       LLVMAddPromoteMemoryToRegisterPass(gallivm->passmgr);
-
-       /* Add some optimization passes */
-       LLVMAddScalarReplAggregatesPass(gallivm->passmgr);
-       LLVMAddLICMPass(gallivm->passmgr);
-       LLVMAddAggressiveDCEPass(gallivm->passmgr);
-       LLVMAddCFGSimplificationPass(gallivm->passmgr);
-#if HAVE_LLVM >= 0x0400
-       /* This is recommended by the instruction combining pass. */
-       LLVMAddEarlyCSEMemSSAPass(gallivm->passmgr);
-#endif
-       LLVMAddInstructionCombiningPass(gallivm->passmgr);
-
        /* Run the pass */
-       LLVMRunPassManager(gallivm->passmgr, ctx->gallivm.module);
-
+       LLVMRunPassManager(ctx->compiler->passmgr, ctx->gallivm.module);
        LLVMDisposeBuilder(ctx->ac.builder);
-       LLVMDisposePassManager(gallivm->passmgr);
-       gallivm_dispose_target_library_info(target_library_info);
 }
 
 void si_llvm_dispose(struct si_shader_context *ctx)
@@ -1409,7 +1180,5 @@ void si_llvm_dispose(struct si_shader_context *ctx)
        FREE(ctx->imms);
        ctx->imms = NULL;
        ctx->imms_num = 0;
-       FREE(ctx->flow);
-       ctx->flow = NULL;
-       ctx->flow_depth_max = 0;
+       ac_llvm_context_dispose(&ctx->ac);
 }