X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.cpp;h=a7786295f6e8c117e94f345c66ba615873d79e96;hb=b7702a7162bba41718dd56b875e5d911f5ab3edb;hp=d6e5fa5592576ce3080bd46afb756d8e7dbb5c1e;hpb=b9a001eeac28d75e73ef643500724585e03d6714;p=libs%2Fgl.git diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp index d6e5fa55..a7786295 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,9 @@ void InlineableFunctionLocator::visit(FunctionCall &call) { unsigned &count = refcounts[def]; ++count; - if(count>1 || def==in_function) + /* Don't inline functions which are called more than once or are called + recursively. */ + if(count>1 || def==current_function) inlineable.erase(def); } @@ -31,105 +35,203 @@ 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) +{ } + +const string &InlineContentInjector::apply(Stage &stage, FunctionDeclaration &target_func, Block &tgt_blk, const NodeList::iterator &ins_pt, FunctionDeclaration &src) +{ + target_block = &tgt_blk; + 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); + tgt_blk.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 InlineDependencyCollector::visit(VariableReference &var) +void InlineContentInjector::visit(VariableReference &var) { - if(var.declaration) + 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) + { + /* Create a new variable to hold the return value of the inlined + function. */ + 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 +245,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 +281,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 +330,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 +410,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_subfield(false), + r_side_effects(false) { } bool UnusedVariableRemover::apply(Stage &stage) @@ -294,8 +423,12 @@ bool UnusedVariableRemover::apply(Stage &stage) BlockVariableMap &global_variables = variables.back(); for(BlockVariableMap::iterator i=global_variables.begin(); i!=global_variables.end(); ++i) { + /* Don't remove output variables which are used by the next stage or the + graphics API. */ if(i->first->interface=="out" && (stage.type==Stage::FRAGMENT || i->first->linked_declaration || !i->first->name.compare(0, 3, "gl_"))) continue; + + // Mark other unreferenced global variables as unused. if(!i->second.referenced) { unused_nodes.insert(i->first); @@ -318,6 +451,7 @@ void UnusedVariableRemover::visit(VariableReference &var) if(var.declaration && !assignment_target) { VariableInfo &var_info = variables.back()[var.declaration]; + // Previous assignments are used by this reference. clear_assignments(var_info, false); var_info.referenced = true; } @@ -330,6 +464,7 @@ void UnusedVariableRemover::visit(InterfaceBlockReference &iface) void UnusedVariableRemover::visit(MemberAccess &memacc) { + r_assign_to_subfield = true; TraversingVisitor::visit(memacc); unused_nodes.erase(memacc.declaration); } @@ -337,18 +472,18 @@ 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_subfield = true; binary.left->visit(*this); - SetForScope set(assignment_target, false); + SetFlag set(assignment_target, false); binary.right->visit(*this); } else @@ -358,24 +493,27 @@ void UnusedVariableRemover::visit(BinaryExpression &binary) void UnusedVariableRemover::visit(Assignment &assign) { { - assign_to_subscript = false; - SetForScope set(assignment_target, !assign.self_referencing); + SetFlag 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; + /* Treat function calls as having side effects so expression statements + consisting of nothing but a function call won't be optimized away. */ + r_side_effects = true; } void UnusedVariableRemover::record_assignment(VariableDeclaration &var, Node &node, bool chained) { VariableInfo &var_info = variables.back()[&var]; + /* An assignment which completely replaces the value of the variable causes + any previous unreferenced assignments to be unused. */ if(!chained) clear_assignments(var_info, true); var_info.assignments.push_back(&node); @@ -394,12 +532,13 @@ void UnusedVariableRemover::clear_assignments(VariableInfo &var_info, bool mark_ void UnusedVariableRemover::visit(ExpressionStatement &expr) { - assignment = 0; - side_effects = false; + r_assignment = 0; + r_assign_to_subfield = false; + 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_subfield)); + if(!r_side_effects) unused_nodes.insert(&expr); } @@ -440,10 +579,18 @@ void UnusedVariableRemover::visit(FunctionDeclaration &func) func.body.visit(*this); BlockVariableMap &block_variables = variables.back(); + + /* Mark global variables as conditionally assigned so assignments in other + functions won't be removed. */ for(BlockVariableMap::iterator i=block_variables.begin(); i!=block_variables.end(); ++i) - i->second.conditionally_assigned = true; + if(!i->second.local) + i->second.conditionally_assigned = true; + + /* Always treat function parameters as referenced. Removing unused + parameters is not currently supported. */ for(NodeArray::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i) block_variables[i->get()].referenced = true; + merge_down_variables(); } @@ -457,7 +604,9 @@ void UnusedVariableRemover::merge_down_variables() { if(!i->second.referenced) unused_nodes.insert(i->first); - clear_assignments(i->second, i->first->interface!="out"); + /* Any unreferenced assignments when a variable runs out of scope + become unused. */ + clear_assignments(i->second, true); continue; } @@ -466,6 +615,7 @@ void UnusedVariableRemover::merge_down_variables() parent_variables.insert(*i); else { + // Merge a non-local variable's state into the parent scope. if(i->second.referenced || !i->second.conditionally_assigned) clear_assignments(j->second, !i->second.referenced); j->second.conditionally_assigned = i->second.conditionally_assigned; @@ -486,20 +636,25 @@ void UnusedVariableRemover::visit(Conditional &cond) swap(variables.back(), if_variables); cond.else_body.visit(*this); + // Combine variables from both branches. BlockVariableMap &else_variables = variables.back(); for(BlockVariableMap::iterator i=else_variables.begin(); i!=else_variables.end(); ++i) { BlockVariableMap::iterator j = if_variables.find(i->first); if(j!=if_variables.end()) { + // The variable was found in both branches. i->second.assignments.insert(i->second.assignments.end(), j->second.assignments.begin(), j->second.assignments.end()); i->second.conditionally_assigned |= j->second.conditionally_assigned; if_variables.erase(j); } else + // Mark variables found in only one branch as conditionally assigned. i->second.conditionally_assigned = true; } + /* Move variables which were only used in the if block into the combined + block. */ for(BlockVariableMap::iterator i=if_variables.begin(); i!=if_variables.end(); ++i) { i->second.conditionally_assigned = true; @@ -513,12 +668,6 @@ void UnusedVariableRemover::visit(Iteration &iter) { variables.push_back(BlockVariableMap()); TraversingVisitor::visit(iter); - - BlockVariableMap &block_variables = variables.back(); - for(BlockVariableMap::iterator i=block_variables.begin(); i!=block_variables.end(); ++i) - if(!i->second.local && i->second.referenced) - clear_assignments(i->second, false); - merge_down_variables(); }