ac: move all LLVM module initialization into ac_create_module

[mesa.git] / src / amd / common / ac_llvm_util.h

diff --git a/src/amd/common/ac_llvm_util.h b/src/amd/common/ac_llvm_util.h
index 84fcbf111cf125fc0aca01e7daf1db077ed5b2d7..6e6d15bb56c493485f39197a7b8b101ba4e5ea0b 100644 (file)
--- a/src/amd/common/ac_llvm_util.h
+++ b/src/amd/common/ac_llvm_util.h
@@ -37,15 +37,14 @@ extern "C" {
 
 enum ac_func_attr {
        AC_FUNC_ATTR_ALWAYSINLINE = (1 << 0),
-       AC_FUNC_ATTR_BYVAL        = (1 << 1),
        AC_FUNC_ATTR_INREG        = (1 << 2),
        AC_FUNC_ATTR_NOALIAS      = (1 << 3),
        AC_FUNC_ATTR_NOUNWIND     = (1 << 4),
        AC_FUNC_ATTR_READNONE     = (1 << 5),
        AC_FUNC_ATTR_READONLY     = (1 << 6),
-       AC_FUNC_ATTR_WRITEONLY    = HAVE_LLVM >= 0x0400 ? (1 << 7) : 0,
-       AC_FUNC_ATTR_INACCESSIBLE_MEM_ONLY = HAVE_LLVM >= 0x0400 ? (1 << 8) : 0,
-       AC_FUNC_ATTR_CONVERGENT = HAVE_LLVM >= 0x0400 ? (1 << 9) : 0,
+       AC_FUNC_ATTR_WRITEONLY    = (1 << 7),
+       AC_FUNC_ATTR_INACCESSIBLE_MEM_ONLY = (1 << 8),
+       AC_FUNC_ATTR_CONVERGENT = (1 << 9),
 
        /* Legacy intrinsic that needs attributes on function declarations
         * and they must match the internal LLVM definition exactly, otherwise
@@ -69,7 +68,9 @@ enum ac_float_mode {
 };
 
 const char *ac_get_llvm_processor_name(enum radeon_family family);
-LLVMTargetMachineRef ac_create_target_machine(enum radeon_family family, enum ac_target_machine_options tm_options);
+LLVMTargetMachineRef ac_create_target_machine(enum radeon_family family,
+                                             enum ac_target_machine_options tm_options,
+                                             const char **out_triple);
 
 LLVMTargetRef ac_get_llvm_target(const char *triple);
 void ac_add_attr_dereferenceable(LLVMValueRef val, uint64_t bytes);
@@ -82,32 +83,34 @@ void ac_dump_module(LLVMModuleRef module);
 
 LLVMValueRef ac_llvm_get_called_value(LLVMValueRef call);
 bool ac_llvm_is_function(LLVMValueRef v);
+LLVMModuleRef ac_create_module(LLVMTargetMachineRef tm, LLVMContextRef ctx);
 
 LLVMBuilderRef ac_create_builder(LLVMContextRef ctx,
                                 enum ac_float_mode float_mode);
 
 void
 ac_llvm_add_target_dep_function_attr(LLVMValueRef F,
-                                    const char *name, int value);
+                                    const char *name, unsigned value);
 
 static inline unsigned
 ac_get_load_intr_attribs(bool can_speculate)
 {
        /* READNONE means writes can't affect it, while READONLY means that
         * writes can affect it. */
-       return can_speculate && HAVE_LLVM >= 0x0400 ?
-                                AC_FUNC_ATTR_READNONE :
-                                AC_FUNC_ATTR_READONLY;
+       return can_speculate ? AC_FUNC_ATTR_READNONE :
+                              AC_FUNC_ATTR_READONLY;
 }
 
 static inline unsigned
 ac_get_store_intr_attribs(bool writeonly_memory)
 {
-       return writeonly_memory && HAVE_LLVM >= 0x0400 ?
-                                 AC_FUNC_ATTR_INACCESSIBLE_MEM_ONLY :
+       return writeonly_memory ? AC_FUNC_ATTR_INACCESSIBLE_MEM_ONLY :
                                  AC_FUNC_ATTR_WRITEONLY;
 }
 
+unsigned
+ac_count_scratch_private_memory(LLVMValueRef function);
+
 #ifdef __cplusplus
 }
 #endif