[Bf-blender-cvs] [51fb6b50988] functions: remove unnecessary type definitions
Jacques Lucke
noreply at git.blender.org
Mon Jul 22 18:13:38 CEST 2019
Commit: 51fb6b50988556ea89e1f477548a7b0eab1fa046
Author: Jacques Lucke
Date: Mon Jul 22 17:31:20 2019 +0200
Branches: functions
https://developer.blender.org/rB51fb6b50988556ea89e1f477548a7b0eab1fa046
remove unnecessary type definitions
===================================================================
M source/blender/functions/backends/llvm/build_ir_body.hpp
M source/blender/functions/backends/llvm/builder.cpp
M source/blender/functions/backends/llvm/builder.hpp
M source/blender/functions/backends/llvm/fgraph_ir_generation.cpp
M source/blender/functions/backends/llvm/ir_for_tuple_call.cpp
M source/blender/functions/backends/llvm/ir_to_tuple_call.cpp
M source/blender/functions/backends/llvm/llvm_types.cpp
M source/blender/functions/backends/llvm/llvm_types.hpp
M source/blender/functions/core/data_flow_graph_builder.hpp
M source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
M source/blender/functions/frontends/data_flow_nodes/graph_generation.hpp
M source/blender/functions/frontends/data_flow_nodes/inserters.cpp
M source/blender/functions/frontends/data_flow_nodes/inserters.hpp
M source/blender/functions/functions/auto_vectorization.cpp
===================================================================
diff --git a/source/blender/functions/backends/llvm/build_ir_body.hpp b/source/blender/functions/backends/llvm/build_ir_body.hpp
index b4d6fa2f236..72cd1b0edbe 100644
--- a/source/blender/functions/backends/llvm/build_ir_body.hpp
+++ b/source/blender/functions/backends/llvm/build_ir_body.hpp
@@ -19,14 +19,14 @@ using FunctionIRCache = Map<void *, llvm::Function *>;
class CodeInterface {
private:
- LLVMValues &m_inputs;
- LLVMValues &m_outputs;
+ Vector<llvm::Value *> &m_inputs;
+ Vector<llvm::Value *> &m_outputs;
llvm::Value *m_context_ptr;
FunctionIRCache &m_function_ir_cache;
public:
- CodeInterface(LLVMValues &inputs,
- LLVMValues &outputs,
+ CodeInterface(Vector<llvm::Value *> &inputs,
+ Vector<llvm::Value *> &outputs,
llvm::Value *context_ptr,
FunctionIRCache &function_ir_cache)
: m_inputs(inputs),
diff --git a/source/blender/functions/backends/llvm/builder.cpp b/source/blender/functions/backends/llvm/builder.cpp
index 9537ac71ce5..45b795dfca0 100644
--- a/source/blender/functions/backends/llvm/builder.cpp
+++ b/source/blender/functions/backends/llvm/builder.cpp
@@ -5,9 +5,9 @@
namespace FN {
-LLVMTypes CodeBuilder::types_of_values(ArrayRef<llvm::Value *> values)
+Vector<llvm::Type *> CodeBuilder::types_of_values(ArrayRef<llvm::Value *> values)
{
- LLVMTypes types;
+ Vector<llvm::Type *> types;
for (llvm::Value *value : values) {
types.append(value->getType());
}
@@ -25,7 +25,7 @@ static llvm::Function *create_wrapper_function(llvm::Module *module,
llvm::BasicBlock *bb = llvm::BasicBlock::Create(module->getContext(), "entry", function);
llvm::IRBuilder<> builder(bb);
- LLVMValues args;
+ Vector<llvm::Value *> args;
for (auto &arg : function->args()) {
args.append(&arg);
}
@@ -66,7 +66,7 @@ llvm::Value *CodeBuilder::CreateCallPointer(void *func_ptr,
llvm::Type *return_type,
const char *function_name)
{
- LLVMTypes arg_types = this->types_of_values(args);
+ Vector<llvm::Type *> arg_types = this->types_of_values(args);
llvm::FunctionType *ftype = llvm::FunctionType::get(
return_type, to_llvm_array_ref(arg_types), false);
return this->CreateCallPointer(func_ptr, ftype, args, function_name);
@@ -106,7 +106,7 @@ void CodeBuilder::CreatePrintf(const char *format, ArrayRef<llvm::Value *> value
this->getModule()->getOrInsertFunction("printf", printf_ftype));
printf_func->addParamAttr(0, llvm::Attribute::NoAlias);
- LLVMValues args;
+ Vector<llvm::Value *> args;
args.append(this->getInt8Ptr(format));
for (llvm::Value *arg : values) {
llvm::Value *passed_arg = arg;
diff --git a/source/blender/functions/backends/llvm/builder.hpp b/source/blender/functions/backends/llvm/builder.hpp
index 46dfdc4c575..07a07eedbe5 100644
--- a/source/blender/functions/backends/llvm/builder.hpp
+++ b/source/blender/functions/backends/llvm/builder.hpp
@@ -10,9 +10,6 @@
namespace FN {
-using LLVMValues = Vector<llvm::Value *>;
-using LLVMTypes = BLI::Vector<llvm::Type *>;
-
class LLVMTypeInfo;
class IRConstruct_ForLoop;
class IRConstruct_IterationsLoop;
@@ -191,7 +188,7 @@ class CodeBuilder {
m_builder.SetInsertPoint(block);
}
- LLVMTypes types_of_values(ArrayRef<llvm::Value *> values);
+ Vector<llvm::Type *> types_of_values(ArrayRef<llvm::Value *> values);
/* Instruction Builders
**************************************/
@@ -429,7 +426,7 @@ class CodeBuilder {
uint length = vector_type->getVectorNumElements();
llvm::Type *base_type = vector_type->getVectorElementType();
- LLVMTypes types(length);
+ Vector<llvm::Type *> types(length);
types.fill(base_type);
llvm::Type *struct_type = this->getStructType(types);
diff --git a/source/blender/functions/backends/llvm/fgraph_ir_generation.cpp b/source/blender/functions/backends/llvm/fgraph_ir_generation.cpp
index 03addaa518d..5e820b950b1 100644
--- a/source/blender/functions/backends/llvm/fgraph_ir_generation.cpp
+++ b/source/blender/functions/backends/llvm/fgraph_ir_generation.cpp
@@ -10,9 +10,6 @@ class BuildGraphIR : public LLVMBuildIRBody {
DataFlowGraph *m_graph;
Set<DFGraphSocket> m_required_sockets;
- using SocketValueMap = Map<DFGraphSocket, llvm::Value *>;
- using FunctionDFGB_SocketSet = Set<DFGraphSocket>;
-
public:
BuildGraphIR(FunctionGraph &fgraph) : m_fgraph(fgraph), m_graph(fgraph.graph().ptr())
{
@@ -38,12 +35,12 @@ class BuildGraphIR : public LLVMBuildIRBody {
CodeInterface &interface,
const BuildIRSettings &settings) const override
{
- SocketValueMap values;
+ Map<DFGraphSocket, llvm::Value *> values;
for (uint i = 0; i < m_fgraph.inputs().size(); i++) {
values.add(m_fgraph.inputs()[i], interface.get_input(i));
}
- FunctionDFGB_SocketSet forwarded_sockets;
+ Set<DFGraphSocket> forwarded_sockets;
for (uint i = 0; i < m_fgraph.outputs().size(); i++) {
DFGraphSocket socket = m_fgraph.outputs()[i];
this->generate_for_socket(builder, interface, settings, socket, values, forwarded_sockets);
@@ -57,8 +54,8 @@ class BuildGraphIR : public LLVMBuildIRBody {
CodeInterface &interface,
const BuildIRSettings &settings,
DFGraphSocket socket,
- SocketValueMap &values,
- FunctionDFGB_SocketSet &forwarded_sockets) const
+ Map<DFGraphSocket, llvm::Value *> &values,
+ Set<DFGraphSocket> &forwarded_sockets) const
{
if (values.contains(socket)) {
/* do nothing */
@@ -70,14 +67,14 @@ class BuildGraphIR : public LLVMBuildIRBody {
}
else if (socket.is_output()) {
uint node_id = m_graph->node_id_of_output(socket);
- LLVMValues input_values;
+ Vector<llvm::Value *> input_values;
for (DFGraphSocket input_socket : m_graph->inputs_of_node(node_id)) {
this->generate_for_socket(
builder, interface, settings, input_socket, values, forwarded_sockets);
input_values.append(values.lookup(input_socket));
}
- LLVMValues output_values = this->build_node_ir(
+ Vector<llvm::Value *> output_values = this->build_node_ir(
builder, interface, settings, node_id, input_values);
uint index = 0;
@@ -94,8 +91,8 @@ class BuildGraphIR : public LLVMBuildIRBody {
void forward_output_if_necessary(CodeBuilder &builder,
DFGraphSocket output,
- SocketValueMap &values,
- FunctionDFGB_SocketSet &forwarded_sockets) const
+ Map<DFGraphSocket, llvm::Value *> &values,
+ Set<DFGraphSocket> &forwarded_sockets) const
{
BLI_assert(output.is_output());
if (!forwarded_sockets.contains(output)) {
@@ -104,7 +101,9 @@ class BuildGraphIR : public LLVMBuildIRBody {
}
}
- void forward_output(CodeBuilder &builder, DFGraphSocket output, SocketValueMap &values) const
+ void forward_output(CodeBuilder &builder,
+ DFGraphSocket output,
+ Map<DFGraphSocket, llvm::Value *> &values) const
{
llvm::Value *value_to_forward = values.lookup(output);
SharedType &type = m_graph->type_of_socket(output);
@@ -135,18 +134,18 @@ class BuildGraphIR : public LLVMBuildIRBody {
}
}
- LLVMValues build_node_ir(CodeBuilder &builder,
- CodeInterface &interface,
- const BuildIRSettings &settings,
- uint node_id,
- LLVMValues &input_values) const
+ Vector<llvm::Value *> build_node_ir(CodeBuilder &builder,
+ CodeInterface &interface,
+ const BuildIRSettings &settings,
+ uint node_id,
+ Vector<llvm::Value *> &input_values) const
{
if (settings.maintain_stack()) {
this->push_stack_frames_for_node(builder, interface.context_ptr(), node_id);
}
SharedFunction &fn = m_graph->function_of_node(node_id);
- LLVMValues output_values(m_graph->outputs_of_node(node_id).size());
+ Vector<llvm::Value *> output_values(m_graph->outputs_of_node(node_id).size());
CodeInterface sub_interface(
input_values, output_values, interface.context_ptr(), interface.function_ir_cache());
diff --git a/source/blender/functions/backends/llvm/ir_for_tuple_call.cpp b/source/blender/functions/backends/llvm/ir_for_tuple_call.cpp
index 0cd549f0145..62c685591d4 100644
--- a/source/blender/functions/backends/llvm/ir_for_tuple_call.cpp
+++ b/source/blender/functions/backends/llvm/ir_for_tuple_call.cpp
@@ -66,7 +66,7 @@ class TupleCallLLVM : public LLVMBuildIRBody {
builder, interface, settings, input_type_infos, output_type_infos);
/* Call wrapper function. */
- LLVMValues call_inputs = interface.inputs();
+ Vector<llvm::Value *> call_inputs = interface.inputs();
if (settings.maintain_stack()) {
call_inputs.append(interface.context_ptr());
}
@@ -88,12 +88,12 @@ class TupleCallLLVM : public LLVMBuildIRBody {
{
Function *fn = m_tuple_call->owner();
- LLVMTypes input_types = builder.types_of_values(interface.inputs());
+ Vector<llvm::Type *> input_types = builder.types_of_values(interface.inputs());
if (settings.maintain_stack()) {
input_types.append(builder.getVoidPtrTy());
}
- LLVMTypes output_types;
+ Vector<llvm::Type *> output_types;
for (auto type_info : output_type_infos) {
output_types.append(type_info->get_type(builder.getContext()));
}
diff --git a/source/blender/functions/backends/llvm/ir_to_tuple_call.cpp b/source/blender/functions/backends/llvm/ir_to_tuple_call.cpp
index 8c2b3657b6b..b3e42a96898 100644
--- a/source/blender/functions/backends/llvm/ir_to_tuple_call.cpp
+++ b/sourc
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list