X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.h;h=ca22c9d8259fdf198c0c63cc5221361ee010c8a6;hb=bde40be11da83206f3d33a8225963d47a413662e;hp=01508f450257ac4bee4b00dffd4e062449f3e8a5;hpb=48700161395ece1c8132ee687bf94cd62c6ec2df;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 01508f45..ca22c9d8 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -10,131 +10,248 @@ namespace Msp {
 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();
 
-	const std::set<FunctionDeclaration *> &apply(Stage &s) { visit(s.content); return inlineable; }
+	const std::set<FunctionDeclaration *> &apply(Stage &s) { s.content.visit(*this); return inlineable; }
 
 private:
 	virtual void visit(FunctionCall &);
 	virtual void visit(FunctionDeclaration &);
-	using TraversingVisitor::visit;
+	virtual void visit(Conditional &);
+	virtual void visit(Iteration &);
+	virtual void visit(Return &);
 };
 
-class FunctionInliner: private TraversingVisitor
+/** 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:
-	std::set<FunctionDeclaration *> inlineable;
-	unsigned extract_result;
-	RefPtr<Expression> inline_result;
+	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:
-	FunctionInliner(const std::set<FunctionDeclaration *> &);
+	InlineContentInjector();
 
-	void apply(Stage &s) { visit(s.content); }
+	const std::string &apply(Stage &, FunctionDeclaration &, Block &, const NodeList<Statement>::iterator &, FunctionDeclaration &);
 
 private:
-	void visit_and_inline(RefPtr<Expression> &);
+	std::string create_unused_name(const std::string &, bool);
 
-	virtual void visit(Block &);
-	virtual void visit(UnaryExpression &);
-	virtual void visit(BinaryExpression &);
-	virtual void visit(MemberAccess &);
+	virtual void visit(VariableReference &);
+	virtual void visit(InterfaceBlockReference &);
 	virtual void visit(FunctionCall &);
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(Return &);
-	using TraversingVisitor::visit;
 };
 
-class ConstantConditionEliminator: private BlockModifier
+/** 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:
-	unsigned scope_level;
-	bool record_only;
-	ExpressionEvaluator::ValueMap variable_values;
+	Stage *stage;
+	std::set<FunctionDeclaration *> inlineable;
+	FunctionDeclaration *current_function;
+	NodeList<Statement>::iterator insert_point;
+	RefPtr<Expression> r_inline_result;
+	bool r_any_inlined;
 
 public:
-	ConstantConditionEliminator();
+	FunctionInliner();
 
-	void apply(Stage &s) { visit(s.content); }
+	bool apply(Stage &);
 
 private:
+	virtual void visit(RefPtr<Expression> &);
 	virtual void visit(Block &);
+	virtual void visit(FunctionCall &);
+	virtual void visit(FunctionDeclaration &);
+	virtual void visit(Iteration &);
+};
+
+/** 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<Expression> *inline_point;
+		bool trivial;
+		bool available;
+
+		ExpressionInfo();
+	};
+
+	std::map<Assignment::Target, 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:
+	ExpressionInliner();
+
+	bool apply(Stage &);
+
+private:
+	void visit_and_record(RefPtr<Expression> &);
+	void inline_expression(Expression &, RefPtr<Expression> &);
+	virtual void visit(Block &);
+	virtual void visit(RefPtr<Expression> &);
+	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 &);
+};
+
+/** 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 &);
-	using BlockModifier::visit;
 };
 
-class UnusedVariableLocator: private TraversingVisitor
+/** 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(TernaryExpression &);
+	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:
+	struct AssignmentInfo
+	{
+		Node *node;
+		Assignment::Target target;
+		std::vector<Node *> used_by;
+
+		AssignmentInfo(): node(0) { }
+	};
+
 	struct VariableInfo
 	{
-		bool local;
-		std::vector<Node *> assignments;
-		bool conditionally_assigned;
+		InterfaceBlock *interface_block;
+		std::vector<AssignmentInfo *> assignments;
+		bool initialized;
+		bool output;
 		bool referenced;
 
-		VariableInfo();
+		VariableInfo(): interface_block(0), initialized(false), output(false), referenced(false) { }
 	};
 
-	typedef std::map<VariableDeclaration *, VariableInfo> BlockVariableMap;
+	typedef std::map<Statement *, VariableInfo> BlockVariableMap;
 
-	std::set<Node *> unused_nodes;
-	std::map<VariableDeclaration *, Node *> aggregates;
-	Node *aggregate;
-	std::vector<BlockVariableMap> variables;
-	Assignment *assignment;
+	Stage *stage;
+	BlockVariableMap variables;
+	std::list<AssignmentInfo> assignments;
+	InterfaceBlock *interface_block;
+	Assignment *r_assignment;
 	bool assignment_target;
-	bool assign_to_subscript;
-	bool global_scope;
+	bool r_side_effects;
+	std::set<Node *> unused_nodes;
 
 public:
-	UnusedVariableLocator();
+	UnusedVariableRemover();
 
-	const std::set<Node *> &apply(Stage &);
+	bool apply(Stage &);
 
 private:
+	void referenced(const Assignment::Target &, Node &);
 	virtual void visit(VariableReference &);
-	virtual void visit(MemberAccess &);
+	virtual void visit(InterfaceBlockReference &);
+	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 &);
+	void record_assignment(const Assignment::Target &, Node &);
 	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 &);
+	void merge_variables(const BlockVariableMap &);
 	virtual void visit(FunctionDeclaration &);
-	void merge_down_variables();
 	virtual void visit(Conditional &);
 	virtual void visit(Iteration &);
-	using TraversingVisitor::visit;
 };
 
-class UnusedFunctionLocator: private TraversingVisitor
+/** Removes function declarations with no references to them. */
+class UnusedFunctionRemover: private TraversingVisitor
 {
 private:
 	std::set<Node *> unused_nodes;
 	std::set<FunctionDeclaration *> used_definitions;
 
 public:
-	const std::set<Node *> &apply(Stage &s) { visit(s.content); return unused_nodes; }
+	bool apply(Stage &s);
 
 private:
 	virtual void visit(FunctionCall &);
 	virtual void visit(FunctionDeclaration &);
-	using TraversingVisitor::visit;
 };
 
 } // namespace SL