X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.cpp;h=8a9992a2dba88a054dfeed5f5f681ba012946147;hb=8173340a7737e32cb25b21b67049102bd1526beb;hp=d6e5fa5592576ce3080bd46afb756d8e7dbb5c1e;hpb=b9a001eeac28d75e73ef643500724585e03d6714;p=libs%2Fgl.git diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp index d6e5fa55..8a9992a2 100644 --- a/source/glsl/optimize.cpp +++ b/source/glsl/optimize.cpp @@ -1,4 +1,5 @@ #include +#include #include "optimize.h" using namespace std; @@ -8,7 +9,8 @@ namespace GL { namespace SL { InlineableFunctionLocator::InlineableFunctionLocator(): - in_function(0) + current_function(0), + return_count(0) { } void InlineableFunctionLocator::visit(FunctionCall &call) @@ -21,7 +23,7 @@ void InlineableFunctionLocator::visit(FunctionCall &call) { unsigned &count = refcounts[def]; ++count; - if(count>1 || def==in_function) + if(count>1 || def==current_function) inlineable.erase(def); } @@ -31,105 +33,201 @@ void InlineableFunctionLocator::visit(FunctionCall &call) void InlineableFunctionLocator::visit(FunctionDeclaration &func) { unsigned &count = refcounts[func.definition]; - if(!count && func.parameters.empty()) + if(count<=1 && func.parameters.empty()) inlineable.insert(func.definition); - SetForScope set(in_function, &func); + SetForScope set(current_function, &func); + return_count = 0; TraversingVisitor::visit(func); } +void InlineableFunctionLocator::visit(Conditional &cond) +{ + TraversingVisitor::visit(cond); + inlineable.erase(current_function); +} + +void InlineableFunctionLocator::visit(Iteration &iter) +{ + TraversingVisitor::visit(iter); + inlineable.erase(current_function); +} + +void InlineableFunctionLocator::visit(Return &ret) +{ + TraversingVisitor::visit(ret); + if(return_count) + inlineable.erase(current_function); + ++return_count; +} + + +InlineContentInjector::InlineContentInjector(): + source_func(0), + remap_names(false), + deps_only(false) +{ } -void InlineDependencyCollector::visit(VariableReference &var) +const string &InlineContentInjector::apply(Stage &stage, FunctionDeclaration &target_func, Block &tgtb, const NodeList::iterator &ins_pt, FunctionDeclaration &src) { - if(var.declaration) + target_block = &tgtb; + source_func = &src; + for(NodeList::iterator i=src.body.body.begin(); i!=src.body.body.end(); ++i) + { + r_inlined_statement = 0; + (*i)->visit(*this); + if(!r_inlined_statement) + r_inlined_statement = (*i)->clone(); + + SetFlag set_remap(remap_names); + r_inlined_statement->visit(*this); + tgtb.body.insert(ins_pt, r_inlined_statement); + } + + NodeReorderer().apply(stage, target_func, dependencies); + + return r_result_name; +} + +string InlineContentInjector::create_unused_name(const string &base, bool always_prefix) +{ + string result = base; + if(always_prefix || target_block->variables.count(result)) + result = format("_%s_%s", source_func->name, base); + unsigned initial_size = result.size(); + for(unsigned i=1; target_block->variables.count(result); ++i) + { + result.erase(initial_size); + result += format("_%d", i); + } + return result; +} + +void InlineContentInjector::visit(VariableReference &var) +{ + if(remap_names) + { + map::const_iterator i = variable_map.find(var.name); + if(i!=variable_map.end()) + var.name = i->second->name; + } + else if(var.declaration) { + SetFlag set_deps(deps_only); dependencies.insert(var.declaration); var.declaration->visit(*this); } } -void InlineDependencyCollector::visit(InterfaceBlockReference &iface) +void InlineContentInjector::visit(InterfaceBlockReference &iface) { - if(iface.declaration) + if(!remap_names && iface.declaration) { + SetFlag set_deps(deps_only); dependencies.insert(iface.declaration); iface.declaration->visit(*this); } } -void InlineDependencyCollector::visit(FunctionCall &call) +void InlineContentInjector::visit(FunctionCall &call) { - if(call.declaration) + if(!remap_names && call.declaration) dependencies.insert(call.declaration); TraversingVisitor::visit(call); } -void InlineDependencyCollector::visit(VariableDeclaration &var) +void InlineContentInjector::visit(VariableDeclaration &var) { + TraversingVisitor::visit(var); + if(var.type_declaration) { + SetFlag set_deps(deps_only); dependencies.insert(var.type_declaration); var.type_declaration->visit(*this); } + + if(!remap_names && !deps_only) + { + RefPtr inlined_var = var.clone(); + inlined_var->name = create_unused_name(var.name, false); + r_inlined_statement = inlined_var; + + variable_map[var.name] = inlined_var.get(); + } +} + +void InlineContentInjector::visit(Return &ret) +{ + TraversingVisitor::visit(ret); + + if(ret.expression) + { + r_result_name = create_unused_name("return", true); + RefPtr var = new VariableDeclaration; + var->source = ret.source; + var->line = ret.line; + var->type = source_func->return_type; + var->name = r_result_name; + var->init_expression = ret.expression->clone(); + r_inlined_statement = var; + } } FunctionInliner::FunctionInliner(): current_function(0), - extract_result(0), - any_inlined(false) + r_any_inlined(false) { } bool FunctionInliner::apply(Stage &s) { stage = &s; inlineable = InlineableFunctionLocator().apply(s); - any_inlined = false; + r_any_inlined = false; s.content.visit(*this); - return any_inlined; + return r_any_inlined; } void FunctionInliner::visit_and_inline(RefPtr &ptr) { - inline_result = 0; + r_inline_result = 0; ptr->visit(*this); - if(inline_result) + if(r_inline_result) { - ptr = inline_result; - any_inlined = true; + ptr = r_inline_result; + r_any_inlined = true; } } void FunctionInliner::visit(Block &block) { - if(extract_result) - --extract_result; - + SetForScope set_block(current_block, &block); + SetForScope::iterator> save_insert_point(insert_point, block.body.begin()); for(NodeList::iterator i=block.body.begin(); i!=block.body.end(); ++i) { + insert_point = i; (*i)->visit(*this); - if(extract_result) - --extract_result; } } void FunctionInliner::visit(UnaryExpression &unary) { visit_and_inline(unary.expression); - inline_result = 0; + r_inline_result = 0; } void FunctionInliner::visit(BinaryExpression &binary) { visit_and_inline(binary.left); visit_and_inline(binary.right); - inline_result = 0; + r_inline_result = 0; } void FunctionInliner::visit(MemberAccess &memacc) { visit_and_inline(memacc.left); - inline_result = 0; + r_inline_result = 0; } void FunctionInliner::visit(FunctionCall &call) @@ -143,21 +241,34 @@ void FunctionInliner::visit(FunctionCall &call) if(def && inlineable.count(def)) { - extract_result = 2; - def->visit(*this); + string result_name = InlineContentInjector().apply(*stage, *current_function, *current_block, insert_point, *def); + + // This will later get removed by UnusedVariableRemover + if(result_name.empty()) + result_name = "msp_unused_from_inline"; - if(inline_result) - NodeReorderer().apply(*stage, *current_function, InlineDependencyCollector().apply(*def)); + RefPtr ref = new VariableReference; + ref->name = result_name; + r_inline_result = ref; + + /* Inlined variables need to be resolved before this function can be + inlined further. */ + inlineable.erase(current_function); } else - inline_result = 0; + r_inline_result = 0; +} + +void FunctionInliner::visit(ExpressionStatement &expr) +{ + visit_and_inline(expr.expression); } void FunctionInliner::visit(VariableDeclaration &var) { if(var.init_expression) visit_and_inline(var.init_expression); - inline_result = 0; + r_inline_result = 0; } void FunctionInliner::visit(FunctionDeclaration &func) @@ -166,12 +277,26 @@ void FunctionInliner::visit(FunctionDeclaration &func) TraversingVisitor::visit(func); } -void FunctionInliner::visit(Return &ret) +void FunctionInliner::visit(Conditional &cond) { - TraversingVisitor::visit(ret); + visit_and_inline(cond.condition); + cond.body.visit(*this); +} - if(extract_result) - inline_result = ret.expression->clone(); +void FunctionInliner::visit(Iteration &iter) +{ + SetForScope set_block(current_block, &iter.body); + if(iter.init_statement) + iter.init_statement->visit(*this); + /* Skip the condition and loop expression parts because they're executed on + every iteration of the loop */ + iter.body.visit(*this); +} + +void FunctionInliner::visit(Return &ret) +{ + if(ret.expression) + visit_and_inline(ret.expression); } @@ -201,7 +326,7 @@ void ConstantConditionEliminator::visit(Block &block) void ConstantConditionEliminator::visit(UnaryExpression &unary) { if(VariableReference *var = dynamic_cast(unary.expression.get())) - if(unary.oper=="++" || unary.oper=="--") + if(unary.oper->token[1]=='+' || unary.oper->token[1]=='-') variable_values.erase(var->declaration); } @@ -281,10 +406,10 @@ UnusedVariableRemover::VariableInfo::VariableInfo(): UnusedVariableRemover::UnusedVariableRemover(): aggregate(0), - assignment(0), + r_assignment(0), assignment_target(false), - assign_to_subscript(false), - side_effects(false) + r_assign_to_subscript(false), + r_side_effects(false) { } bool UnusedVariableRemover::apply(Stage &stage) @@ -337,16 +462,16 @@ void UnusedVariableRemover::visit(MemberAccess &memacc) void UnusedVariableRemover::visit(UnaryExpression &unary) { TraversingVisitor::visit(unary); - if(unary.oper=="++" || unary.oper=="--") - side_effects = true; + if(unary.oper->token[1]=='+' || unary.oper->token[1]=='-') + r_side_effects = true; } void UnusedVariableRemover::visit(BinaryExpression &binary) { - if(binary.oper=="[") + if(binary.oper->token[0]=='[') { if(assignment_target) - assign_to_subscript = true; + r_assign_to_subscript = true; binary.left->visit(*this); SetForScope set(assignment_target, false); binary.right->visit(*this); @@ -358,19 +483,19 @@ void UnusedVariableRemover::visit(BinaryExpression &binary) void UnusedVariableRemover::visit(Assignment &assign) { { - assign_to_subscript = false; + r_assign_to_subscript = false; SetForScope set(assignment_target, !assign.self_referencing); assign.left->visit(*this); } assign.right->visit(*this); - assignment = &assign; - side_effects = true; + r_assignment = &assign; + r_side_effects = true; } void UnusedVariableRemover::visit(FunctionCall &call) { TraversingVisitor::visit(call); - side_effects = true; + r_side_effects = true; } void UnusedVariableRemover::record_assignment(VariableDeclaration &var, Node &node, bool chained) @@ -394,12 +519,12 @@ void UnusedVariableRemover::clear_assignments(VariableInfo &var_info, bool mark_ void UnusedVariableRemover::visit(ExpressionStatement &expr) { - assignment = 0; - side_effects = false; + r_assignment = 0; + r_side_effects = false; TraversingVisitor::visit(expr); - if(assignment && assignment->target_declaration) - record_assignment(*assignment->target_declaration, expr, (assignment->self_referencing || assign_to_subscript)); - if(!side_effects) + if(r_assignment && r_assignment->target_declaration) + record_assignment(*r_assignment->target_declaration, expr, (r_assignment->self_referencing || r_assign_to_subscript)); + if(!r_side_effects) unused_nodes.insert(&expr); }