X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.cpp;h=08455c8ac61412d71fb8cfbb684c857f6a883169;hb=223e295e4404a3913b8243d3b7eb12da39a68144;hp=3f63dd8a7debaac0c492c0f3f5a2e9491d989ebf;hpb=7f29c6d2a4eee36538d7ccf24980e749592e2444;p=libs%2Fgl.git diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp index 3f63dd8a..08455c8a 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,22 +33,157 @@ 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 &) +{ + inlineable.erase(current_function); +} + +void InlineableFunctionLocator::visit(Iteration &) +{ + inlineable.erase(current_function); +} + +void InlineableFunctionLocator::visit(Return &) +{ + 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 &tgtb, const NodeList::iterator &ins_pt, FunctionDeclaration &src) +{ + target_block = &tgtb; + source_func = &src; + for(NodeList::iterator i=src.body.body.begin(); i!=src.body.body.end(); ++i) + { + inlined_statement = 0; + (*i)->visit(*this); + if(!inlined_statement) + inlined_statement = (*i)->clone(); + + SetFlag set_remap(remap_names); + inlined_statement->visit(*this); + tgtb.body.insert(ins_pt, inlined_statement); + } + + NodeReorderer().apply(stage, target_func, dependencies); + + return 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 InlineContentInjector::visit(InterfaceBlockReference &iface) +{ + if(!remap_names && iface.declaration) + { + SetFlag set_deps(deps_only); + dependencies.insert(iface.declaration); + iface.declaration->visit(*this); + } +} + +void InlineContentInjector::visit(FunctionCall &call) +{ + if(!remap_names && call.declaration) + dependencies.insert(call.declaration); + TraversingVisitor::visit(call); +} + +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); + inlined_statement = inlined_var; + + variable_map[var.name] = inlined_var.get(); + } +} + +void InlineContentInjector::visit(Return &ret) +{ + TraversingVisitor::visit(ret); + + if(ret.expression) + { + 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 = result_name; + var->init_expression = ret.expression->clone(); + inlined_statement = var; + } +} + FunctionInliner::FunctionInliner(): - extract_result(0) + current_function(0), + any_inlined(false) { } -void FunctionInliner::apply(Stage &stage) +bool FunctionInliner::apply(Stage &s) { - inlineable = InlineableFunctionLocator().apply(stage); - stage.content.visit(*this); + stage = &s; + inlineable = InlineableFunctionLocator().apply(s); + any_inlined = false; + s.content.visit(*this); + return any_inlined; } void FunctionInliner::visit_and_inline(RefPtr &ptr) @@ -54,19 +191,20 @@ void FunctionInliner::visit_and_inline(RefPtr &ptr) inline_result = 0; ptr->visit(*this); if(inline_result) + { ptr = inline_result; + 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; } } @@ -100,13 +238,29 @@ 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"; + + RefPtr ref = new VariableReference; + ref->name = result_name; + inline_result = ref; + + /* Inlined variables need to be resolved before this function can be + inlined further. */ + inlineable.erase(current_function); } else inline_result = 0; } +void FunctionInliner::visit(ExpressionStatement &expr) +{ + visit_and_inline(expr.expression); +} + void FunctionInliner::visit(VariableDeclaration &var) { if(var.init_expression) @@ -114,12 +268,16 @@ void FunctionInliner::visit(VariableDeclaration &var) inline_result = 0; } -void FunctionInliner::visit(Return &ret) +void FunctionInliner::visit(FunctionDeclaration &func) { - TraversingVisitor::visit(ret); + SetForScope set_func(current_function, &func); + TraversingVisitor::visit(func); +} - if(extract_result) - inline_result = ret.expression->clone(); +void FunctionInliner::visit(Return &ret) +{ + if(ret.expression) + visit_and_inline(ret.expression); } @@ -149,7 +307,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); } @@ -160,7 +318,13 @@ void ConstantConditionEliminator::visit(Assignment &assign) void ConstantConditionEliminator::visit(VariableDeclaration &var) { - if((var.constant || current_block->parent) && var.init_expression) + bool constant = var.constant; + if(constant && var.layout) + { + for(vector::const_iterator i=var.layout->qualifiers.begin(); (constant && i!=var.layout->qualifiers.end()); ++i) + constant = (i->name!="constant_id"); + } + if((constant || current_block->parent) && var.init_expression) variable_values[&var] = var.init_expression.get(); } @@ -225,7 +389,8 @@ UnusedVariableRemover::UnusedVariableRemover(): aggregate(0), assignment(0), assignment_target(false), - assign_to_subscript(false) + assign_to_subscript(false), + side_effects(false) { } bool UnusedVariableRemover::apply(Stage &stage) @@ -275,9 +440,16 @@ void UnusedVariableRemover::visit(MemberAccess &memacc) unused_nodes.erase(memacc.declaration); } +void UnusedVariableRemover::visit(UnaryExpression &unary) +{ + TraversingVisitor::visit(unary); + if(unary.oper->token[1]=='+' || unary.oper->token[1]=='-') + side_effects = true; +} + void UnusedVariableRemover::visit(BinaryExpression &binary) { - if(binary.oper=="[") + if(binary.oper->token[0]=='[') { if(assignment_target) assign_to_subscript = true; @@ -298,6 +470,13 @@ void UnusedVariableRemover::visit(Assignment &assign) } assign.right->visit(*this); assignment = &assign; + side_effects = true; +} + +void UnusedVariableRemover::visit(FunctionCall &call) +{ + TraversingVisitor::visit(call); + side_effects = true; } void UnusedVariableRemover::record_assignment(VariableDeclaration &var, Node &node, bool chained) @@ -322,9 +501,12 @@ void UnusedVariableRemover::clear_assignments(VariableInfo &var_info, bool mark_ void UnusedVariableRemover::visit(ExpressionStatement &expr) { assignment = 0; + 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) + unused_nodes.insert(&expr); } void UnusedVariableRemover::visit(StructDeclaration &strct)