source_func = call.declaration->definition;
/* Populate referenced_names from the target function so we can rename
- variables from the inlined function that would conflict. */
+ variables from the inlined function that would conflict. Only consider
+ names declared in blocks linearly related to the target block. */
pass = REFERENCED;
- target_func.visit(*this);
+ tgt_blk.visit(*this);
+ for(const Block *b=&tgt_blk; b; b=b->parent)
+ for(const auto &kvp: b->variables)
+ referenced_names.insert(kvp.first);
+ for(const auto &kvp: stage.interface_blocks)
+ if(kvp.second->name.find(' ')!=string::npos)
+ for(const auto &kvp2: kvp.second->block_declaration->members.variables)
+ referenced_names.insert(kvp2.first);
/* Inline and rename passes must be interleaved so used variable names are
known when inlining the return statement. */
referenced_names.insert(var.name);
}
-void InlineContentInjector::visit(InterfaceBlockReference &iface)
-{
- if(pass==REFERENCED)
- referenced_names.insert(iface.name);
-}
-
void InlineContentInjector::visit(FunctionCall &call)
{
if(pass==REFERENCED)
ExpressionUse use;
use.reference = &expr;
use.ref_scope = current_block;
- use.blocked = access_write;
+ use.blocked = access_write || r_ref_info->blocked;
if(iteration_body && !r_ref_info->trivial)
{
void ExpressionInliner::visit(UnaryExpression &unary)
{
- SetFlag set_write(access_write, access_write || unary.oper->token[1]=='+' || unary.oper->token[1]=='-');
+ SetFlag set_write(access_write, (unary.oper->token[1]=='+' || unary.oper->token[1]=='-'));
visit(unary.expression);
r_trivial = false;
}
r_trivial = true;
visit(assign.right);
- auto i = assignments.find(assign.target);
+ auto i = assignments.find(assign.target.declaration);
if(i!=assignments.end())
{
- if(iteration_body && i->second->expression)
+ if(iteration_body && i->second && i->second->expression)
{
/* Block inlining into previous references within the iteration
statement. On iterations after the first they would refer to the
u.blocked = (k==iteration_body);
}
- expressions.push_back(ExpressionInfo());
+ for(; (i!=assignments.end() && i->first.declaration==assign.target.declaration); ++i)
+ if(targets_overlap(i->first, assign.target))
+ i->second->blocked = true;
+
+ expressions.emplace_back();
ExpressionInfo &info = expressions.back();
info.target = assign.target;
// Self-referencing assignments can't be inlined without additional work.
info.assign_scope = current_block;
info.trivial = r_trivial;
- i->second = &info;
+ assignments[assign.target] = &info;
}
r_trivial = false;
analyze and non-trivial expressions could be expensive to inline. */
if((current_block->parent || (constant && r_trivial)) && var.interface.empty())
{
- expressions.push_back(ExpressionInfo());
+ expressions.emplace_back();
ExpressionInfo &info = expressions.back();
info.target = &var;
/* Assume variables declared in an iteration initialization statement
}
-void ConstantConditionEliminator::apply(Stage &stage)
+bool ConstantConditionEliminator::apply(Stage &stage)
{
stage.content.visit(*this);
NodeRemover().apply(stage, nodes_to_remove);
+ return !nodes_to_remove.empty();
}
ConstantConditionEliminator::ConstantStatus ConstantConditionEliminator::check_constant_condition(const Expression &expr)
{
if(type.base_type)
unused_nodes.erase(type.base_type);
+ if(type.base_image)
+ unused_nodes.erase(type.base_image);
unused_nodes.insert(&type);
}
TraversingVisitor::visit(var);
}
-void UnusedTypeRemover::visit(InterfaceBlock &iface)
-{
- unused_nodes.erase(iface.type_declaration);
-}
-
void UnusedTypeRemover::visit(FunctionDeclaration &func)
{
unused_nodes.erase(func.return_type_declaration);
{
bool loop_external = false;
for(AssignmentInfo *a: var_info.assignments)
- {
- bool covered = true;
- for(unsigned j=0; (covered && j<a->target.chain_len && j<target.chain_len); ++j)
- {
- Assignment::Target::ChainType type1 = static_cast<Assignment::Target::ChainType>(a->target.chain[j]&0xC0);
- Assignment::Target::ChainType type2 = static_cast<Assignment::Target::ChainType>(target.chain[j]&0xC0);
- unsigned index1 = a->target.chain[j]&0x3F;
- unsigned index2 = target.chain[j]&0x3F;
- if(type1==Assignment::Target::SWIZZLE || type2==Assignment::Target::SWIZZLE)
- {
- if(type1==Assignment::Target::SWIZZLE && type2==Assignment::Target::SWIZZLE)
- covered = index1&index2;
- else if(type1==Assignment::Target::ARRAY && index1<4)
- covered = index2&(1<<index1);
- else if(type2==Assignment::Target::ARRAY && index2<4)
- covered = index1&(1<<index2);
- /* If it's some other combination (shouldn't happen), leave
- covered as true */
- }
- else
- covered = (type1==type2 && (index1==index2 || index1==0x3F || index2==0x3F));
- }
-
- if(covered)
+ if(targets_overlap(a->target, target))
{
a->used_by.push_back(&node);
if(a->in_loop<in_loop)
loop_external = true;
}
- }
if(loop_external)
loop_ext_refs.push_back(&node);
{
if(composite_reference)
r_reference.declaration = var.declaration;
- else
+ else if(var.declaration)
referenced(var.declaration, var);
}
-void UnusedVariableRemover::visit(InterfaceBlockReference &iface)
-{
- if(composite_reference)
- r_reference.declaration = iface.declaration;
- else
- referenced(iface.declaration, iface);
-}
-
void UnusedVariableRemover::visit_composite(Expression &expr)
{
if(!composite_reference)
{
SetFlag clear_assignment(assignment_target, false);
SetFlag clear_composite(composite_reference, false);
+ SetForScope<Assignment::Target> clear_reference(r_reference, Assignment::Target());
binary.right->visit(*this);
}
void UnusedVariableRemover::record_assignment(const Assignment::Target &target, Node &node)
{
- assignments.push_back(AssignmentInfo());
+ assignments.emplace_back();
AssignmentInfo &assign_info = assignments.back();
assign_info.node = &node;
assign_info.target = target;
/* Mark variables as output if they're used by the next stage or the
graphics API. */
- var_info.output = (var.interface=="out" && (stage->type==Stage::FRAGMENT || var.linked_declaration || !var.name.compare(0, 3, "gl_")));
+ bool builtin = (!var.name.compare(0, 3, "gl_") || (var.block_declaration && !var.block_declaration->block_name.compare(0, 3, "gl_")));
+ var_info.output = (var.interface=="out" && (stage->type==Stage::FRAGMENT || var.linked_declaration || builtin));
// Linked outputs are automatically referenced.
if(var_info.output && var.linked_declaration)
}
}
-void UnusedVariableRemover::visit(InterfaceBlock &iface)
-{
- VariableInfo &var_info = variables[&iface];
- var_info.output = (iface.interface=="out" && (iface.linked_block || !iface.block_name.compare(0, 3, "gl_")));
-}
-
void UnusedVariableRemover::merge_variables(const BlockVariableMap &other_vars)
{
for(const auto &kvp: other_vars)
vector<Node *> saved_refs;
swap(loop_ext_refs, saved_refs);
{
+ if(iter.init_statement)
+ iter.init_statement->visit(*this);
SetForScope<unsigned> set_loop(in_loop, in_loop+1);
- TraversingVisitor::visit(iter);
+ if(iter.condition)
+ iter.condition->visit(*this);
+ iter.body.visit(*this);
+ if(iter.loop_expression)
+ iter.loop_expression->visit(*this);
}
swap(loop_ext_refs, saved_refs);
projects / libs / gl.git / blobdiff