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

VarAction2: Prune group ranges for constant values

Browse Source 
Add chicken bit to control pruning
This commit is contained in:
Jonathan G Rennison
2022-05-29 21:34:45 +01:00
parent c894d5a86d
commit 4687a8c2a4
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/debug_settings.h
View File

@@ -22,6 +22,7 @@ enum ChickenBitFlags {
DCBF_DESYNC_CHECK_PERIODIC_SIGNALS = 5, DCBF_DESYNC_CHECK_PERIODIC_SIGNALS = 5,
DCBF_NO_OPTIMISE_VARACT2 = 6, DCBF_NO_OPTIMISE_VARACT2 = 6,
DCBF_NO_OPTIMISE_VARACT2_DSE = 7, DCBF_NO_OPTIMISE_VARACT2_DSE = 7,
DCBF_NO_OPTIMISE_VARACT2_PRUNE = 8,
}; };
inline bool HasChickenBit(ChickenBitFlags flag) inline bool HasChickenBit(ChickenBitFlags flag)

19
src/newgrf.cpp
View File

@@ -5522,13 +5522,13 @@ static const SpriteGroup *GetGroupFromGroupID(byte setid, byte type, uint16 grou
} }
const SpriteGroup *result = _cur.spritegroups[groupid]; const SpriteGroup *result = _cur.spritegroups[groupid];
if (HasChickenBit(DCBF_NO_OPTIMISE_VARACT2)) return result; if (HasChickenBit(DCBF_NO_OPTIMISE_VARACT2) || HasChickenBit(DCBF_NO_OPTIMISE_VARACT2_PRUNE)) return result;
while (result != nullptr) { while (result != nullptr) {
if (result->type == SGT_DETERMINISTIC) { if (result->type == SGT_DETERMINISTIC) {
const DeterministicSpriteGroup *sg = static_cast<const DeterministicSpriteGroup *>(result); const DeterministicSpriteGroup *sg = static_cast<const DeterministicSpriteGroup *>(result);
if (sg->adjusts.size() == 1 && sg->adjusts[0].variable == 0x1A) { if (sg->adjusts.size() == 0 || (sg->adjusts.size() == 1 && sg->adjusts[0].variable == 0x1A && (sg->adjusts[0].operation == DSGA_OP_ADD || sg->adjusts[0].operation == DSGA_OP_RST))) {
/* Deterministic sprite group can be trivially resolved, skip it */ /* Deterministic sprite group can be trivially resolved, skip it */
uint32 value = EvaluateDeterministicSpriteGroupAdjust(sg->size, sg->adjusts[0], nullptr, 0, UINT_MAX); uint32 value = (sg->adjusts.size() == 1) ? EvaluateDeterministicSpriteGroupAdjust(sg->size, sg->adjusts[0], nullptr, 0, UINT_MAX) : 0;
result = sg->default_group; result = sg->default_group;
for (const auto &range : sg->ranges) { for (const auto &range : sg->ranges) {
if (range.low <= value && value <= range.high) { if (range.low <= value && value <= range.high) {
@@ -6074,6 +6074,19 @@ static void OptimiseVarAction2DeterministicSpriteGroup(VarAction2OptimiseState &
{ {
if (unlikely(HasChickenBit(DCBF_NO_OPTIMISE_VARACT2))) return; if (unlikely(HasChickenBit(DCBF_NO_OPTIMISE_VARACT2))) return;
if (!HasChickenBit(DCBF_NO_OPTIMISE_VARACT2_PRUNE) && (state.inference & VA2AIF_HAVE_CONSTANT) && !group->calculated_result) {
/* Result of this sprite group is always the same, discard the unused branches */
const SpriteGroup *target = group->default_group;
for (const auto &range : group->ranges) {
if (range.low <= state.current_constant && state.current_constant <= range.high) {
target = range.group;
}
}
group->default_group = target;
group->error_group = target;
group->ranges.clear();
}
std::bitset<256> bits; std::bitset<256> bits;
if (!group->calculated_result) { if (!group->calculated_result) {
auto handle_group = [&](const SpriteGroup *sg) { auto handle_group = [&](const SpriteGroup *sg) {