Hash :
93b659f9
Author :
Date :
2025-07-04T12:35:29
Remove PoolAllocator push/pop feature PoolAllocator would manage a stack of memory pools upon client calling push() and pop(). This made the code unnecessarily complicated. The feature was only used with nesting of one, to mark the memory unused after a shader compile. Fix by removing the push/pop feature. Instantiate PoolAllocator in places the previous push() was and uninstantiating instead of previous pop(). This removes the feature where the PoolAllocator would hold on to the allocated memory in order to reuse it. This is seen as a progression: the allocator is held by the compiler, the compiler is held by the shader and each shader typically see only one compile. Thus the free pages were just leaking unused until the shader was destroyed. Instead, destructing the PoolAllocator instead of pop() will donate the memory back to platform/OS, where it is likely more useful. To preserve existing Vulkan behavior, add PoolAllocator::reset() which would mark the memory unused but leave them reserved for the PoolAllocator. Removes UB where PageHeader::nextPage would be accessed after ~PageHeader. Bug: angleproject:429513168 Change-Id: I21e58b46e0887380db3a2cab5ce22f0042cfae9e Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6701153 Reviewed-by: Geoff Lang <geofflang@chromium.org> Auto-Submit: Kimmo Kinnunen <kkinnunen@apple.com> Commit-Queue: Kimmo Kinnunen <kkinnunen@apple.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176
//
// Copyright 2016 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// ShaderCompileTreeTest.cpp:
// Test that shader validation results in the correct compile status.
//
#include "tests/test_utils/ShaderCompileTreeTest.h"
#include "compiler/translator/glsl/TranslatorESSL.h"
#include "compiler/translator/tree_util/IntermTraverse.h"
namespace sh
{
namespace
{
// Checks that the node traversed is a zero node. It can be made out of multiple constructors and
// constant union nodes as long as there's no arithmetic involved and all constants are zero.
class OnlyContainsZeroConstantsTraverser final : public TIntermTraverser
{
public:
OnlyContainsZeroConstantsTraverser()
: TIntermTraverser(true, false, false), mOnlyContainsConstantZeros(true)
{}
bool visitUnary(Visit, TIntermUnary *node) override
{
mOnlyContainsConstantZeros = false;
return false;
}
bool visitBinary(Visit, TIntermBinary *node) override
{
mOnlyContainsConstantZeros = false;
return false;
}
bool visitTernary(Visit, TIntermTernary *node) override
{
mOnlyContainsConstantZeros = false;
return false;
}
bool visitSwizzle(Visit, TIntermSwizzle *node) override
{
mOnlyContainsConstantZeros = false;
return false;
}
bool visitAggregate(Visit, TIntermAggregate *node) override
{
if (node->getOp() != EOpConstruct)
{
mOnlyContainsConstantZeros = false;
return false;
}
return true;
}
void visitSymbol(TIntermSymbol *node) override { mOnlyContainsConstantZeros = false; }
void visitConstantUnion(TIntermConstantUnion *node) override
{
if (!mOnlyContainsConstantZeros)
{
return;
}
const TType &type = node->getType();
size_t objectSize = type.getObjectSize();
for (size_t i = 0u; i < objectSize && mOnlyContainsConstantZeros; ++i)
{
bool isZero = false;
switch (type.getBasicType())
{
case EbtFloat:
isZero = (node->getFConst(i) == 0.0f);
break;
case EbtInt:
isZero = (node->getIConst(i) == 0);
break;
case EbtUInt:
isZero = (node->getUConst(i) == 0u);
break;
case EbtBool:
isZero = (node->getBConst(i) == false);
break;
default:
// Cannot handle.
break;
}
if (!isZero)
{
mOnlyContainsConstantZeros = false;
return;
}
}
}
bool onlyContainsConstantZeros() const { return mOnlyContainsConstantZeros; }
private:
bool mOnlyContainsConstantZeros;
};
} // anonymous namespace
void ShaderCompileTreeTest::SetUp()
{
SetGlobalPoolAllocator(&mAllocator);
ShBuiltInResources resources;
sh::InitBuiltInResources(&resources);
initResources(&resources);
mTranslator = new TranslatorESSL(getShaderType(), getShaderSpec());
ASSERT_TRUE(mTranslator->Init(resources));
}
void ShaderCompileTreeTest::TearDown()
{
delete mTranslator;
SetGlobalPoolAllocator(nullptr);
mAllocator.reset();
}
bool ShaderCompileTreeTest::compile(const std::string &shaderString)
{
const char *shaderStrings[] = {shaderString.c_str()};
mASTRoot = mTranslator->compileTreeForTesting(shaderStrings, 1, mCompileOptions);
TInfoSink &infoSink = mTranslator->getInfoSink();
mInfoLog = infoSink.info.c_str();
return mASTRoot != nullptr;
}
void ShaderCompileTreeTest::compileAssumeSuccess(const std::string &shaderString)
{
if (!compile(shaderString))
{
FAIL() << "Shader compilation into ESSL failed, log:\n" << mInfoLog;
}
}
bool ShaderCompileTreeTest::hasWarning() const
{
return mInfoLog.find("WARNING: ") != std::string::npos;
}
const std::vector<sh::ShaderVariable> &ShaderCompileTreeTest::getUniforms() const
{
return mTranslator->getUniforms();
}
const std::vector<sh::ShaderVariable> &ShaderCompileTreeTest::getAttributes() const
{
return mTranslator->getAttributes();
}
bool IsZero(TIntermNode *node)
{
if (!node->getAsTyped())
{
return false;
}
OnlyContainsZeroConstantsTraverser traverser;
node->traverse(&traverser);
return traverser.onlyContainsConstantZeros();
}
} // namespace sh