Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GDScript] Opportunistically elide array allocations when performing += on Array #76527

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+27 −3
Open

[GDScript] Opportunistically elide array allocations when performing += on Array #76527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
768c656
[GDScript] Perform update-and-assign operations in place when possible.
resistor Jan 25, 2023
4f89e98
[GDScript] Opportunistically elide array allocations when performing …
resistor Apr 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions core/variant/variant_op.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,14 +835,28 @@ class OperatorEvaluatorAddArray {
static void evaluate(const Variant &p_left, const Variant &p_right, Variant *r_ret, bool &r_valid) {
const Array &array_a = *VariantGetInternalPtr<Array>::get_ptr(&p_left);
const Array &array_b = *VariantGetInternalPtr<Array>::get_ptr(&p_right);
if (r_ret == &p_left) {
Array &array_ret = *VariantGetInternalPtr<Array>::get_ptr(r_ret);
array_ret.append_array(array_b);
r_valid = true;
return;
}

Array sum;
_add_arrays(sum, array_a, array_b);
*r_ret = sum;
r_valid = true;
}
static inline void validated_evaluate(const Variant *left, const Variant *right, Variant *r_ret) {
*r_ret = Array();
_add_arrays(*VariantGetInternalPtr<Array>::get_ptr(r_ret), *VariantGetInternalPtr<Array>::get_ptr(left), *VariantGetInternalPtr<Array>::get_ptr(right));
if (r_ret == left) {
Array &array_ret = *VariantGetInternalPtr<Array>::get_ptr(r_ret);
array_ret.append_array(*VariantGetInternalPtr<Array>::get_ptr(right));
return;
}

Array sum;
_add_arrays(sum, *VariantGetInternalPtr<Array>::get_ptr(left), *VariantGetInternalPtr<Array>::get_ptr(right));
*r_ret = sum;
}
static void ptr_evaluate(const void *left, const void *right, void *r_ret) {
Array ret;
Expand Down
12 changes: 11 additions & 1 deletion modules/gdscript/gdscript_compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1165,8 +1165,18 @@ GDScriptCodeGenerator::Address GDScriptCompiler::_parse_expression(CodeGen &code
bool has_operation = assignment->operation != GDScriptParser::AssignmentNode::OP_NONE;
if (has_operation) {
// Perform operation.
GDScriptCodeGenerator::Address op_result = codegen.add_temporary(_gdtype_from_datatype(assignment->get_datatype(), codegen.script));
GDScriptCodeGenerator::Address og_value = _parse_expression(codegen, r_error, assignment->assignee);
GDScriptDataType assignment_type = _gdtype_from_datatype(assignment->get_datatype(), codegen.script);
if (!has_setter && !assignment->use_conversion_assign && assignment_type.kind == GDScriptDataType::BUILTIN && og_value.type.kind == GDScriptDataType::BUILTIN && assignment_type.builtin_type == og_value.type.builtin_type) {
// If there's nothing special about the assignment, perform the assignment as part of the operator
gen->write_binary_operator(target, assignment->variant_op, og_value, assigned_value);
if (assigned_value.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
gen->pop_temporary(); // Pop assigned value if not done before.
}
return GDScriptCodeGenerator::Address();
}

GDScriptCodeGenerator::Address op_result = codegen.add_temporary(assignment_type);
gen->write_binary_operator(op_result, assignment->variant_op, og_value, assigned_value);
to_assign = op_result;

Expand Down