[Bf-blender-cvs] [b6e533a0d9b] functions: don't expose different array execution functions
Jacques Lucke
noreply at git.blender.org
Wed Jul 31 16:21:07 CEST 2019
Commit: b6e533a0d9b4b736a8282f2be9d08b93534c034e
Author: Jacques Lucke
Date: Wed Jul 31 15:48:50 2019 +0200
Branches: functions
https://developer.blender.org/rBb6e533a0d9b4b736a8282f2be9d08b93534c034e
don't expose different array execution functions
===================================================================
M source/blender/functions/functions/array_execution.cpp
M source/blender/functions/functions/array_execution.hpp
M source/blender/simulations/bparticles/particle_function.cpp
===================================================================
diff --git a/source/blender/functions/functions/array_execution.cpp b/source/blender/functions/functions/array_execution.cpp
index 76c324087ab..57449ca77b4 100644
--- a/source/blender/functions/functions/array_execution.cpp
+++ b/source/blender/functions/functions/array_execution.cpp
@@ -24,148 +24,166 @@ ArrayExecution::ArrayExecution(SharedFunction function) : m_function(std::move(f
/* Tuple Call Array Execution
**********************************************/
-TupleCallArrayExecution::TupleCallArrayExecution(SharedFunction function)
- : ArrayExecution(std::move(function))
-{
- BLI_assert(m_function->has_body<TupleCallBody>());
-}
+class TupleCallArrayExecution : public ArrayExecution {
+ public:
+ TupleCallArrayExecution(SharedFunction function) : ArrayExecution(std::move(function))
+ {
+ BLI_assert(m_function->has_body<TupleCallBody>());
+ }
-void TupleCallArrayExecution::call(ArrayRef<uint> indices,
- ArrayRef<void *> input_buffers,
- ArrayRef<void *> output_buffers,
- ExecutionContext &execution_context)
-{
- uint input_amount = m_function->input_amount();
- uint output_amount = m_function->output_amount();
+ void call(ArrayRef<uint> indices,
+ ArrayRef<void *> input_buffers,
+ ArrayRef<void *> output_buffers,
+ ExecutionContext &execution_context) override
+ {
+ uint input_amount = m_function->input_amount();
+ uint output_amount = m_function->output_amount();
- BLI_assert(input_amount == input_buffers.size());
- BLI_assert(output_amount == output_buffers.size());
+ BLI_assert(input_amount == input_buffers.size());
+ BLI_assert(output_amount == output_buffers.size());
- TupleCallBody &body = m_function->body<TupleCallBody>();
- FN_TUPLE_CALL_ALLOC_TUPLES(body, fn_in, fn_out);
+ TupleCallBody &body = m_function->body<TupleCallBody>();
+ FN_TUPLE_CALL_ALLOC_TUPLES(body, fn_in, fn_out);
- for (uint index : indices) {
- for (uint i = 0; i < input_amount; i++) {
- void *ptr = POINTER_OFFSET(input_buffers[i], index * m_input_sizes[i]);
- fn_in.copy_in__dynamic(i, ptr);
- }
+ for (uint index : indices) {
+ for (uint i = 0; i < input_amount; i++) {
+ void *ptr = POINTER_OFFSET(input_buffers[i], index * m_input_sizes[i]);
+ fn_in.copy_in__dynamic(i, ptr);
+ }
- body.call(fn_in, fn_out, execution_context);
+ body.call(fn_in, fn_out, execution_context);
- for (uint i = 0; i < output_amount; i++) {
- void *ptr = POINTER_OFFSET(output_buffers[i], index * m_output_sizes[i]);
- fn_out.relocate_out__dynamic(i, ptr);
+ for (uint i = 0; i < output_amount; i++) {
+ void *ptr = POINTER_OFFSET(output_buffers[i], index * m_output_sizes[i]);
+ fn_out.relocate_out__dynamic(i, ptr);
+ }
}
}
-}
+};
-/* LLVM Array Execution
- ********************************************/
-
-LLVMArrayExecution::LLVMArrayExecution(SharedFunction function)
- : ArrayExecution(std::move(function))
+std::unique_ptr<ArrayExecution> get_tuple_call_array_execution(SharedFunction function)
{
- BLI_assert(m_function->has_body<LLVMBuildIRBody>());
- this->compile();
+ return std::unique_ptr<ArrayExecution>(new TupleCallArrayExecution(std::move(function)));
}
-void LLVMArrayExecution::compile()
-{
- llvm::LLVMContext *context = aquire_llvm_context();
- llvm::Module *module = new llvm::Module(m_function->name() + " (Array Execution)", *context);
- llvm::Function *function = this->build_function_ir(module);
- m_compiled_function = CompiledLLVM::FromIR(module, function);
- release_llvm_context(context);
-}
+/* LLVM Array Execution
+ ********************************************/
typedef void(CompiledFunctionSignature)(
uint size, uint *indices, void **input_buffers, void **output_buffers, void *context_ptr);
-llvm::Function *LLVMArrayExecution::build_function_ir(llvm::Module *module)
-{
- Vector<LLVMTypeInfo *> input_type_infos = m_function->input_extensions<LLVMTypeInfo>();
- Vector<LLVMTypeInfo *> output_type_infos = m_function->output_extensions<LLVMTypeInfo>();
-
- llvm::LLVMContext &context = module->getContext();
- LLVMBuildIRBody &body = m_function->body<LLVMBuildIRBody>();
- llvm::FunctionType *ftype = llvm::TypeBuilder<CompiledFunctionSignature, false>::get(context);
-
- llvm::Function *function = llvm::Function::Create(
- ftype, llvm::GlobalValue::LinkageTypes::ExternalLinkage, module->getName(), module);
-
- llvm::BasicBlock *bb = llvm::BasicBlock::Create(context, "entry", function);
- CodeBuilder builder(bb);
-
- llvm::Value *size = builder.take_function_input(0, "indices_amount");
- llvm::Value *indices = builder.take_function_input(1, "indices");
- llvm::Value *input_buffers_arg = builder.take_function_input(2, "input_buffers");
- llvm::Value *output_buffers_arg = builder.take_function_input(3, "output_buffers");
- llvm::Value *context_ptr = builder.take_function_input(4, "context_ptr");
-
- Vector<llvm::Value *> input_buffers;
- for (uint i = 0; i < m_function->input_amount(); i++) {
- uint element_size = m_input_sizes[i];
- llvm::Value *input_buffer = builder.CreateLoadAtIndex(input_buffers_arg, i);
- llvm::Value *typed_input_buffer = builder.CastToPointerWithStride(input_buffer, element_size);
- typed_input_buffer->setName(to_llvm(m_function->input_name(i) + " Array"));
- input_buffers.append(typed_input_buffer);
+class LLVMArrayExecution : public ArrayExecution {
+ private:
+ std::unique_ptr<CompiledLLVM> m_compiled_function;
+
+ public:
+ LLVMArrayExecution(SharedFunction function) : ArrayExecution(std::move(function))
+ {
+ BLI_assert(m_function->has_body<LLVMBuildIRBody>());
+ this->compile();
}
- Vector<llvm::Value *> output_buffers;
- for (uint i = 0; i < m_function->output_amount(); i++) {
- uint element_size = m_output_sizes[i];
- llvm::Value *output_buffer = builder.CreateLoadAtIndex(output_buffers_arg, i);
- llvm::Value *typed_output_buffer = builder.CastToPointerWithStride(output_buffer,
- element_size);
- output_buffers.append(typed_output_buffer);
+
+ void call(ArrayRef<uint> indices,
+ ArrayRef<void *> input_buffers,
+ ArrayRef<void *> output_buffers,
+ ExecutionContext &execution_context) override
+ {
+ CompiledFunctionSignature *function = (CompiledFunctionSignature *)
+ m_compiled_function->function_ptr();
+ function(indices.size(),
+ indices.begin(),
+ input_buffers.begin(),
+ output_buffers.begin(),
+ (void *)&execution_context);
}
- IRConstruct_IterationsLoop loop = builder.CreateNIterationsLoop(size, "Loop");
- CodeBuilder body_builder = loop.body_builder();
- llvm::Value *iteration = loop.current_iteration();
- llvm::Value *index_to_process = body_builder.CreateLoadAtIndex(indices, iteration);
- Vector<llvm::Value *> input_values;
- for (uint i = 0; i < m_function->input_amount(); i++) {
- llvm::Value *addr = body_builder.CreateGEP(input_buffers[i], index_to_process);
- llvm::Value *value = input_type_infos[i]->build_load_ir__copy(body_builder, addr);
- value->setName(to_llvm(m_function->input_name(i)));
- input_values.append(value);
+ private:
+ void compile()
+ {
+ llvm::LLVMContext *context = aquire_llvm_context();
+ llvm::Module *module = new llvm::Module(m_function->name() + " (Array Execution)", *context);
+ llvm::Function *function = this->build_function_ir(module);
+ m_compiled_function = CompiledLLVM::FromIR(module, function);
+ release_llvm_context(context);
}
- input_values.append(context_ptr);
+ llvm::Function *build_function_ir(llvm::Module *module)
+ {
+ Vector<LLVMTypeInfo *> input_type_infos = m_function->input_extensions<LLVMTypeInfo>();
+ Vector<LLVMTypeInfo *> output_type_infos = m_function->output_extensions<LLVMTypeInfo>();
+
+ llvm::LLVMContext &context = module->getContext();
+ LLVMBuildIRBody &body = m_function->body<LLVMBuildIRBody>();
+ llvm::FunctionType *ftype = llvm::TypeBuilder<CompiledFunctionSignature, false>::get(context);
+
+ llvm::Function *function = llvm::Function::Create(
+ ftype, llvm::GlobalValue::LinkageTypes::ExternalLinkage, module->getName(), module);
+
+ llvm::BasicBlock *bb = llvm::BasicBlock::Create(context, "entry", function);
+ CodeBuilder builder(bb);
+
+ llvm::Value *size = builder.take_function_input(0, "indices_amount");
+ llvm::Value *indices = builder.take_function_input(1, "indices");
+ llvm::Value *input_buffers_arg = builder.take_function_input(2, "input_buffers");
+ llvm::Value *output_buffers_arg = builder.take_function_input(3, "output_buffers");
+ llvm::Value *context_ptr = builder.take_function_input(4, "context_ptr");
+
+ Vector<llvm::Value *> input_buffers;
+ for (uint i = 0; i < m_function->input_amount(); i++) {
+ uint element_size = m_input_sizes[i];
+ llvm::Value *input_buffer = builder.CreateLoadAtIndex(input_buffers_arg, i);
+ llvm::Value *typed_input_buffer = builder.CastToPointerWithStride(input_buffer,
+ element_size);
+ typed_input_buffer->setName(to_llvm(m_function->input_name(i) + " Array"));
+ input_buffers.append(typed_input_buffer);
+ }
+ Vector<llvm::Value *> output_buffers;
+ for (uint i = 0; i < m_function->output_amount(); i++) {
+ uint element_size = m_output_sizes[i];
+ llvm::Value *output_buffer = builder.CreateLoadAtIndex(output_buffers_arg, i);
+ llvm::Value *typed_output_buffer = builder.CastToPointerWithStride(output_buffer,
+ element_size);
+ output_buffers.append(typed_output_buffer);
+ }
- FunctionIRCache function_cache;
- BuildIRSettings settings;
- llvm::Function *actual_function = body.build_function(
- module, m_function->name(), settings, function_cache);
+ IRConstruct_IterationsLoop loop = b
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list