X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.h;h=4663c12ec12e6ffcaf4fe946fff5bbc36cc5ed90;hb=daff631cf87db75bcae616605e759d281258d9e4;hp=ed016ca0b9ddd26dd5e8e871b25a0f15484e2881;hpb=30465dd3b9f55ec42c4b19c3c2077eede7237a26;p=libs%2Fgl.git diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h index ed016ca0..4663c12e 100644 --- a/source/glsl/optimize.h +++ b/source/glsl/optimize.h @@ -11,14 +11,15 @@ namespace GL { namespace SL { /** Finds functions which are candidates for inlining. Currently this means -functions which have no parameters, are only called once, and that call occurs -after the definition of the function. */ +functions which have no parameters, contain no more than one return statement, +and are only called once. */ class InlineableFunctionLocator: private TraversingVisitor { private: std::map refcounts; std::set inlineable; - FunctionDeclaration *in_function; + FunctionDeclaration *current_function; + unsigned return_count; public: InlineableFunctionLocator(); @@ -28,6 +29,39 @@ public: private: virtual void visit(FunctionCall &); virtual void visit(FunctionDeclaration &); + virtual void visit(Conditional &); + virtual void visit(Iteration &); + virtual void visit(Return &); +}; + +/** Injects statements from one function into another. Local variables are +renamed to avoid conflicts. After inlining, uses NodeReorderer to cause +dependencies of the inlined statements to appear before the target function. */ +class InlineContentInjector: private TraversingVisitor +{ +private: + FunctionDeclaration *source_func; + Block *target_block; + std::map variable_map; + bool remap_names; + bool deps_only; + RefPtr r_inlined_statement; + std::set dependencies; + std::string r_result_name; + +public: + InlineContentInjector(); + + const std::string &apply(Stage &, FunctionDeclaration &, Block &, const NodeList::iterator &, FunctionDeclaration &); + +private: + std::string create_unused_name(const std::string &, bool); + + virtual void visit(VariableReference &); + virtual void visit(InterfaceBlockReference &); + virtual void visit(FunctionCall &); + virtual void visit(VariableDeclaration &); + virtual void visit(Return &); }; /** Inlines functions. Internally uses InlineableFunctionLocator to find @@ -36,14 +70,17 @@ are inlined. */ class FunctionInliner: private TraversingVisitor { private: + Stage *stage; std::set inlineable; - unsigned extract_result; - RefPtr inline_result; + FunctionDeclaration *current_function; + NodeList::iterator insert_point; + RefPtr r_inline_result; + bool r_any_inlined; public: FunctionInliner(); - void apply(Stage &); + bool apply(Stage &); private: void visit_and_inline(RefPtr &); @@ -51,9 +88,66 @@ private: virtual void visit(Block &); virtual void visit(UnaryExpression &); virtual void visit(BinaryExpression &); + virtual void visit(Assignment &a) { visit(static_cast(a)); } virtual void visit(MemberAccess &); + virtual void visit(Swizzle &); virtual void visit(FunctionCall &); + virtual void visit(ExpressionStatement &); virtual void visit(VariableDeclaration &); + virtual void visit(FunctionDeclaration &); + virtual void visit(Conditional &); + virtual void visit(Iteration &); + virtual void visit(Return &); +}; + +/** Inlines variables into expressions. Variables with trivial values (those +consisting of a single literal or variable reference) are always inlined. +Variables which are only referenced once are also inlined. */ +class ExpressionInliner: private TraversingVisitor +{ +private: + struct ExpressionInfo + { + Expression *expression; + Block *assign_scope; + RefPtr *inline_point; + const Operator *inner_oper; + const Operator *outer_oper; + bool inline_on_rhs; + bool trivial; + bool available; + + ExpressionInfo(); + }; + + std::map expressions; + ExpressionInfo *r_ref_info; + bool r_any_inlined; + bool r_trivial; + bool mutating; + bool iteration_init; + Block *iteration_body; + const Operator *r_oper; + +public: + ExpressionInliner(); + + bool apply(Stage &); + +private: + void visit_and_record(RefPtr &, const Operator *, bool); + void inline_expression(Expression &, RefPtr &, const Operator *, const Operator *, bool); + virtual void visit(Block &); + virtual void visit(VariableReference &); + virtual void visit(MemberAccess &); + virtual void visit(Swizzle &); + virtual void visit(UnaryExpression &); + virtual void visit(BinaryExpression &); + virtual void visit(Assignment &); + virtual void visit(FunctionCall &); + virtual void visit(VariableDeclaration &); + virtual void visit(Conditional &); + virtual void visit(Iteration &); virtual void visit(Return &); }; @@ -62,25 +156,40 @@ determined as constant at compile time. */ class ConstantConditionEliminator: private TraversingVisitor { private: - bool record_only; - ExpressionEvaluator::ValueMap variable_values; NodeList::iterator insert_point; std::set nodes_to_remove; public: - ConstantConditionEliminator(); - void apply(Stage &); private: virtual void visit(Block &); - virtual void visit(UnaryExpression &); - virtual void visit(Assignment &); - virtual void visit(VariableDeclaration &); virtual void visit(Conditional &); virtual void visit(Iteration &); }; +/** Removes types which are not used anywhere. */ +class UnusedTypeRemover: private TraversingVisitor +{ +private: + std::set unused_nodes; + +public: + bool apply(Stage &); + +private: + virtual void visit(Literal &); + virtual void visit(UnaryExpression &); + virtual void visit(BinaryExpression &); + virtual void visit(FunctionCall &); + virtual void visit(BasicTypeDeclaration &); + virtual void visit(ImageTypeDeclaration &); + virtual void visit(StructDeclaration &); + virtual void visit(VariableDeclaration &); + virtual void visit(InterfaceBlock &); + virtual void visit(FunctionDeclaration &); +}; + /** Removes variable declarations with no references to them. Assignment statements where the result is not used are also removed. */ class UnusedVariableRemover: private TraversingVisitor @@ -88,23 +197,25 @@ class UnusedVariableRemover: private TraversingVisitor private: struct VariableInfo { - bool local; std::vector assignments; + bool local; + bool output; bool conditionally_assigned; bool referenced; + InterfaceBlock *interface_block; VariableInfo(); }; - typedef std::map BlockVariableMap; + typedef std::map BlockVariableMap; + Stage *stage; std::set unused_nodes; - std::map aggregates; - Node *aggregate; std::vector variables; - Assignment *assignment; + InterfaceBlock *interface_block; + Assignment *r_assignment; bool assignment_target; - bool assign_to_subscript; + bool r_side_effects; public: UnusedVariableRemover(); @@ -112,15 +223,18 @@ public: bool apply(Stage &); private: + void reference_used(Statement &); virtual void visit(VariableReference &); virtual void visit(InterfaceBlockReference &); - virtual void visit(MemberAccess &); + virtual void visit(UnaryExpression &); virtual void visit(BinaryExpression &); virtual void visit(Assignment &); - void record_assignment(VariableDeclaration &, Node &, bool); + void record_assignment(const Assignment::Target &, Node &, bool); void clear_assignments(VariableInfo &, bool); + virtual void visit(FunctionCall &); virtual void visit(ExpressionStatement &); - virtual void visit(StructDeclaration &); + // Ignore structs because their members can't be accessed directly. + virtual void visit(StructDeclaration &) { } virtual void visit(VariableDeclaration &); virtual void visit(InterfaceBlock &); virtual void visit(FunctionDeclaration &);