dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VarAction2: Flatten constant operations on constants in more cases

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-05-26 22:31:02 +01:00
parent 2360b3e93e
commit f0a0b2e200
1 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/newgrf.cpp
View File

@@ -5684,6 +5684,35 @@ static void NewSpriteGroup(ByteReader *buf)
} }
}; };
auto replace_with_constant_load = [&](uint32 constant) {
group->adjusts.pop_back();
if ((prev_inference & VA2AIF_HAVE_CONSTANT) && constant == current_constant) {
/* Don't create a new constant load for the same constant as was there previously */
inference = prev_inference;
return;
}
while (!group->adjusts.empty()) {
const DeterministicSpriteGroupAdjust &prev = group->adjusts.back();
if (prev.variable != 0x7E && !IsEvalAdjustWithSideEffects(prev.operation)) {
/* Delete useless operation */
group->adjusts.pop_back();
} else {
break;
}
}
DeterministicSpriteGroupAdjust &replacement = group->adjusts.emplace_back();
replacement.operation = group->adjusts.size() == 1 ? DSGA_OP_ADD : DSGA_OP_RST;
replacement.variable = 0x1A;
replacement.shift_num = 0;
replacement.type = DSGA_TYPE_NONE;
replacement.and_mask = constant;
replacement.add_val = 0;
replacement.divmod_val = 0;
inference = VA2AIF_PREV_MASK_ADJUST | VA2AIF_HAVE_CONSTANT;
add_inferences_from_mask(constant);
current_constant = constant;
};
if ((prev_inference & VA2AIF_PREV_TERNARY) && adjust.variable == 0x1A && IsEvalAdjustUsableForConstantPropagation(adjust.operation)) { if ((prev_inference & VA2AIF_PREV_TERNARY) && adjust.variable == 0x1A && IsEvalAdjustUsableForConstantPropagation(adjust.operation)) {
/* Propagate constant operation back into previous ternary */ /* Propagate constant operation back into previous ternary */
DeterministicSpriteGroupAdjust &prev = group->adjusts[group->adjusts.size() - 2]; DeterministicSpriteGroupAdjust &prev = group->adjusts[group->adjusts.size() - 2];
@@ -5691,6 +5720,9 @@ static void NewSpriteGroup(ByteReader *buf)
prev.add_val = EvaluateDeterministicSpriteGroupAdjust(group->size, adjust, nullptr, prev.add_val, UINT_MAX); prev.add_val = EvaluateDeterministicSpriteGroupAdjust(group->size, adjust, nullptr, prev.add_val, UINT_MAX);
group->adjusts.pop_back(); group->adjusts.pop_back();
inference = prev_inference; inference = prev_inference;
} else if ((prev_inference & VA2AIF_HAVE_CONSTANT) && adjust.variable == 0x1A && IsEvalAdjustUsableForConstantPropagation(adjust.operation)) {
/* Reduce constant operation on previous constant */
replace_with_constant_load(EvaluateDeterministicSpriteGroupAdjust(group->size, adjust, nullptr, current_constant, UINT_MAX));
} else if (adjust.type == DSGA_TYPE_NONE && group->adjusts.size() > 1) { } else if (adjust.type == DSGA_TYPE_NONE && group->adjusts.size() > 1) {
/* Not the first adjustment */ /* Not the first adjustment */
if (adjust.variable != 0x7E) { if (adjust.variable != 0x7E) {
@@ -5700,25 +5732,7 @@ static void NewSpriteGroup(ByteReader *buf)
inference = prev_inference; inference = prev_inference;
} else if (adjust.and_mask == 0 && IsEvalAdjustWithZeroAlwaysZero(adjust.operation)) { } else if (adjust.and_mask == 0 && IsEvalAdjustWithZeroAlwaysZero(adjust.operation)) {
/* Operation always returns 0, replace it and any useless prior operations */ /* Operation always returns 0, replace it and any useless prior operations */
group->adjusts.pop_back(); replace_with_constant_load(0);
while (!group->adjusts.empty()) {
const DeterministicSpriteGroupAdjust &prev = group->adjusts.back();
if (prev.variable != 0x7E && !IsEvalAdjustWithSideEffects(prev.operation)) {
/* Delete useless operation */
group->adjusts.pop_back();
} else {
break;
}
}
DeterministicSpriteGroupAdjust &replacement = group->adjusts.emplace_back();
replacement.operation = group->adjusts.size() == 1 ? DSGA_OP_ADD : DSGA_OP_RST;
replacement.variable = 0x1A;
replacement.shift_num = 0;
replacement.type = DSGA_TYPE_NONE;
replacement.and_mask = 0;
replacement.add_val = 0;
replacement.divmod_val = 0;
inference = VA2AIF_SIGNED_NON_NEGATIVE | VA2AIF_ONE_OR_ZERO | VA2AIF_PREV_MASK_ADJUST;
} else { } else {
switch (adjust.operation) { switch (adjust.operation) {
case DSGA_OP_SMIN: case DSGA_OP_SMIN:
@@ -5902,15 +5916,7 @@ static void NewSpriteGroup(ByteReader *buf)
} }
} }
if (adjust.variable == 0x1A || adjust.and_mask == 0) { if (adjust.variable == 0x1A || adjust.and_mask == 0) {
uint32 val = EvaluateDeterministicSpriteGroupAdjust(group->size, adjust, nullptr, 0, UINT_MAX); replace_with_constant_load(EvaluateDeterministicSpriteGroupAdjust(group->size, adjust, nullptr, 0, UINT_MAX));
if ((prev_inference & VA2AIF_HAVE_CONSTANT) && current_constant == val) {
/* reloading previous constant, remove */
group->adjusts.pop_back();
inference = prev_inference;
break;
}
inference |= VA2AIF_HAVE_CONSTANT;
current_constant = val;
} }
break; break;
case DSGA_OP_SHR: case DSGA_OP_SHR: