X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Foptimize.h;h=ae55e5af10f5590f886906355342327a8ddb87be;hp=652ac252cf32bf5a3015f3e87441826df8b29296;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=caa84a9d8adce6dc702f6e0ae32961b77a0a73ea diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h index 652ac252..ae55e5af 100644 --- a/source/glsl/optimize.h +++ b/source/glsl/optimize.h @@ -3,28 +3,39 @@ #include #include -#include "evaluate.h" #include "visitor.h" namespace Msp { namespace GL { namespace SL { +/** Assigns values to specialization constants, turning them into normal +constants. */ +class ConstantSpecializer: private TraversingVisitor +{ +private: + const std::map *values = 0; + +public: + void apply(Stage &, const std::map &); + +private: + virtual void visit(VariableDeclaration &); +}; + /** Finds functions which are candidates for inlining. Currently this means -functions which have no parameters, contain no more than one return statement, -and are only called once. */ +functions which have no flow control statements, no more than one return +statement, and are either builtins or only called once. */ class InlineableFunctionLocator: private TraversingVisitor { private: std::map refcounts; std::set inlineable; - FunctionDeclaration *current_function; - unsigned return_count; + FunctionDeclaration *current_function = 0; + unsigned return_count = 0; public: - InlineableFunctionLocator(); - - const std::set &apply(Stage &s) { s.content.visit(*this); return inlineable; } + std::set apply(Stage &s) { s.content.visit(*this); return inlineable; } private: virtual void visit(FunctionCall &); @@ -40,23 +51,25 @@ 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; + enum Pass + { + REFERENCED, + INLINE, + RENAME + }; + + FunctionDeclaration *source_func = 0; + Block staging_block; + Pass pass = REFERENCED; RefPtr r_inlined_statement; std::set dependencies; + std::set referenced_names; std::string r_result_name; public: - InlineContentInjector(); - - const std::string &apply(Stage &, FunctionDeclaration &, Block &, const NodeList::iterator &, FunctionDeclaration &); + std::string apply(Stage &, FunctionDeclaration &, Block &, const NodeList::iterator &, FunctionCall &); private: - std::string create_unused_name(const std::string &, bool); - virtual void visit(VariableReference &); virtual void visit(InterfaceBlockReference &); virtual void visit(FunctionCall &); @@ -70,33 +83,23 @@ are inlined. */ class FunctionInliner: private TraversingVisitor { private: - Stage *stage; + Stage *stage = 0; std::set inlineable; - FunctionDeclaration *current_function; + FunctionDeclaration *current_function = 0; NodeList::iterator insert_point; RefPtr r_inline_result; - bool r_any_inlined; + bool r_any_inlined = false; + bool r_inlined_here = false; public: - FunctionInliner(); - bool apply(Stage &); private: - void visit_and_inline(RefPtr &); - + virtual void visit(RefPtr &); 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(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 @@ -105,67 +108,145 @@ Variables which are only referenced once are also inlined. */ class ExpressionInliner: private TraversingVisitor { private: + struct ExpressionUse + { + RefPtr *reference = 0; + Block *ref_scope = 0; + bool blocked = false; + }; + 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(); + Assignment::Target target; + RefPtr expression; + Block *assign_scope = 0; + std::vector uses; + bool trivial = false; }; - 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; + std::list expressions; + std::map assignments; + ExpressionInfo *r_ref_info = 0; + bool r_trivial = false; + bool access_read = true; + bool access_write = false; + bool iteration_init = false; + Block *iteration_body = 0; + const Operator *r_oper = 0; 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(RefPtr &); 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(TernaryExpression &); + virtual void visit(FunctionCall &); + virtual void visit(VariableDeclaration &); + virtual void visit(Iteration &); +}; + +/** Replaces expressions consisting entirely of literals with the results of +evaluating the expression.*/ +class ConstantFolder: private TraversingVisitor +{ +private: + VariableDeclaration *iteration_var = 0; + Variant iter_init_value; + Variant r_constant_value; + bool iteration_init = false; + bool r_constant = false; + bool r_literal = false; + bool r_uses_iter_var = false; + bool r_any_folded = false; + +public: + bool apply(Stage &s) { s.content.visit(*this); return r_any_folded; } + +private: + template + static T evaluate_logical(char, T, T); + template + static bool evaluate_relation(const char *, T, T); + template + static T evaluate_arithmetic(char, T, T); + template + static T evaluate_int_special_op(char, T, T); + template + void convert_to_result(const Variant &); + void set_result(const Variant &, bool = false); + + virtual void visit(RefPtr &); + virtual void visit(Literal &); + 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(TernaryExpression &); virtual void visit(FunctionCall &); virtual void visit(VariableDeclaration &); - virtual void visit(Conditional &); virtual void visit(Iteration &); - virtual void visit(Return &); }; /** Removes conditional statements and loops where the condition can be -determined as constant at compile time. */ +determined as constant at compile time. Also removes such statements where +the body is empty and the condition has no side effects. */ class ConstantConditionEliminator: private TraversingVisitor { private: + enum ConstantStatus + { + CONSTANT_FALSE, + CONSTANT_TRUE, + NOT_CONSTANT + }; + NodeList::iterator insert_point; std::set nodes_to_remove; + RefPtr r_ternary_result; + bool r_external_side_effects = false; public: void apply(Stage &); private: + ConstantStatus check_constant_condition(const Expression &); + virtual void visit(Block &); + virtual void visit(RefPtr &); + virtual void visit(UnaryExpression &); + virtual void visit(Assignment &); + virtual void visit(TernaryExpression &); + virtual void visit(FunctionCall &); virtual void visit(Conditional &); virtual void visit(Iteration &); }; +class UnreachableCodeRemover: private TraversingVisitor +{ +private: + bool reachable = true; + std::set unreachable_nodes; + +public: + virtual bool apply(Stage &); + +private: + virtual void visit(Block &); + virtual void visit(FunctionDeclaration &); + virtual void visit(Conditional &); + virtual void visit(Iteration &); + virtual void visit(Return &) { reachable = false; } + virtual void visit(Jump &) { reachable = false; } +}; + /** Removes types which are not used anywhere. */ class UnusedTypeRemover: private TraversingVisitor { @@ -176,14 +257,12 @@ public: bool apply(Stage &); private: - virtual void visit(Literal &); - virtual void visit(UnaryExpression &); - virtual void visit(BinaryExpression &); - virtual void visit(FunctionCall &); + virtual void visit(RefPtr &); virtual void visit(BasicTypeDeclaration &); virtual void visit(ImageTypeDeclaration &); virtual void visit(StructDeclaration &); virtual void visit(VariableDeclaration &); + virtual void visit(InterfaceBlock &); virtual void visit(FunctionDeclaration &); }; @@ -192,48 +271,61 @@ statements where the result is not used are also removed. */ class UnusedVariableRemover: private TraversingVisitor { private: - struct VariableInfo + struct AssignmentInfo { - bool local; - std::vector assignments; - bool conditionally_assigned; - bool referenced; - - VariableInfo(); + Node *node = 0; + Assignment::Target target; + std::vector used_by; + unsigned in_loop = 0; }; - typedef std::map BlockVariableMap; + struct VariableInfo + { + InterfaceBlock *interface_block = 0; + std::vector assignments; + bool initialized = false; + bool output = false; + bool referenced = false; + }; + typedef std::map BlockVariableMap; + + Stage *stage = 0; + BlockVariableMap variables; + std::list assignments; + InterfaceBlock *interface_block = 0; + Assignment *r_assignment = 0; + bool assignment_target = false; + bool r_side_effects = false; + bool in_struct = false; + bool composite_reference = false; + unsigned in_loop = 0; + std::vector loop_ext_refs; + Assignment::Target r_reference; std::set unused_nodes; - std::map aggregates; - Node *aggregate; - std::vector variables; - Assignment *r_assignment; - bool assignment_target; - bool r_assign_to_subfield; - bool r_side_effects; public: - UnusedVariableRemover(); - bool apply(Stage &); private: + void referenced(const Assignment::Target &, Node &); virtual void visit(VariableReference &); virtual void visit(InterfaceBlockReference &); + void visit_composite(Expression &); virtual void visit(MemberAccess &); + virtual void visit(Swizzle &); virtual void visit(UnaryExpression &); virtual void visit(BinaryExpression &); virtual void visit(Assignment &); - void record_assignment(VariableDeclaration &, Node &, bool); - void clear_assignments(VariableInfo &, bool); + virtual void visit(TernaryExpression &); virtual void visit(FunctionCall &); + void record_assignment(const Assignment::Target &, Node &); virtual void visit(ExpressionStatement &); virtual void visit(StructDeclaration &); virtual void visit(VariableDeclaration &); virtual void visit(InterfaceBlock &); + void merge_variables(const BlockVariableMap &); virtual void visit(FunctionDeclaration &); - void merge_down_variables(); virtual void visit(Conditional &); virtual void visit(Iteration &); };