namespace GL {
namespace SL {
+/** 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. */
class InlineableFunctionLocator: private TraversingVisitor
{
private:
std::map<FunctionDeclaration *, unsigned> refcounts;
std::set<FunctionDeclaration *> inlineable;
- FunctionDeclaration *in_function;
+ FunctionDeclaration *current_function;
+ unsigned return_count;
public:
InlineableFunctionLocator();
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<std::string, VariableDeclaration *> variable_map;
+ bool remap_names;
+ bool deps_only;
+ RefPtr<Statement> r_inlined_statement;
+ std::set<Node *> dependencies;
+ std::string r_result_name;
+
+public:
+ InlineContentInjector();
+
+ const std::string &apply(Stage &, FunctionDeclaration &, Block &, const NodeList<Statement>::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
+candidate functions. Only functions which consist of a single return statement
+are inlined. */
class FunctionInliner: private TraversingVisitor
{
private:
+ Stage *stage;
std::set<FunctionDeclaration *> inlineable;
- unsigned extract_result;
- RefPtr<Expression> inline_result;
+ FunctionDeclaration *current_function;
+ NodeList<Statement>::iterator insert_point;
+ RefPtr<Expression> r_inline_result;
+ bool r_any_inlined;
public:
FunctionInliner();
- void apply(Stage &);
+ bool apply(Stage &);
private:
void visit_and_inline(RefPtr<Expression> &);
virtual void visit(Block &);
virtual void visit(UnaryExpression &);
virtual void visit(BinaryExpression &);
+ virtual void visit(Assignment &a) { visit(static_cast<BinaryExpression &>(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 &);
};
-class ConstantConditionEliminator: private TraversingVisitor
+/** 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:
- bool record_only;
- ExpressionEvaluator::ValueMap variable_values;
- NodeList<Statement>::iterator insert_point;
- std::set<Node *> nodes_to_remove;
+ struct ExpressionInfo
+ {
+ Expression *expression;
+ Block *assign_scope;
+ RefPtr<Expression> *inline_point;
+ const Operator *inner_oper;
+ const Operator *outer_oper;
+ bool inline_on_rhs;
+ bool trivial;
+ bool available;
+
+ ExpressionInfo();
+ };
+
+ std::map<VariableDeclaration *, ExpressionInfo> 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:
- ConstantConditionEliminator();
+ ExpressionInliner();
- void apply(Stage &);
+ bool apply(Stage &);
private:
+ void visit_and_record(RefPtr<Expression> &, const Operator *, bool);
+ void inline_expression(Expression &, RefPtr<Expression> &, const Operator *, const Operator *, bool);
virtual void visit(Block &);
+ virtual void visit(VariableReference &);
+ virtual void visit(MemberAccess &);
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 &);
+};
+
+/** Removes conditional statements and loops where the condition can be
+determined as constant at compile time. */
+class ConstantConditionEliminator: private TraversingVisitor
+{
+private:
+ NodeList<Statement>::iterator insert_point;
+ std::set<Node *> nodes_to_remove;
+
+public:
+ void apply(Stage &);
+
+private:
+ virtual void visit(Block &);
+ virtual void visit(Conditional &);
+ virtual void visit(Iteration &);
+};
+
+/** Removes types which are not used anywhere. */
+class UnusedTypeRemover: private TraversingVisitor
+{
+private:
+ std::set<Node *> 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
{
private:
std::map<VariableDeclaration *, Node *> aggregates;
Node *aggregate;
std::vector<BlockVariableMap> variables;
- Assignment *assignment;
+ Assignment *r_assignment;
bool assignment_target;
- bool assign_to_subscript;
+ bool r_assign_to_subfield;
+ bool r_side_effects;
public:
UnusedVariableRemover();
private:
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 clear_assignments(VariableInfo &, bool);
+ virtual void visit(FunctionCall &);
virtual void visit(ExpressionStatement &);
virtual void visit(StructDeclaration &);
virtual void visit(VariableDeclaration &);
virtual void visit(Iteration &);
};
+/** Removes function declarations with no references to them. */
class UnusedFunctionRemover: private TraversingVisitor
{
private: