Skip to content

A
angle
Commit b391ec40 by Olli Etuaho Committed by Commit Bot
Options

Generate code for looking up built-ins

Instead of storing built-ins in a std::unordered_map, we now generate a series of switch statements using the hash value of the look-up string. This works similarly to earlier implementation of looking up unmangled built-ins. Those built-ins that need to be initialized at run-time are stored as member variables of TSymbolTable. This increases compiler init performance significantly, as well as increasing compiler perf test scores around 1-2%. Binary size is larger than before though. BUG=angleproject:2267 TEST=angle_unittests Change-Id: If1dcd36f0d2b30c2ed315cdcf6e831ae9fe70c94 Reviewed-on: https://chromium-review.googlesource.com/960031Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
parent aa5d883e
Showing with 94 additions and 96 deletions
scripts/run_code_generation.py
...@@ -165,6 +165,7 @@ generators = { ...@@ -165,6 +165,7 @@ generators = {
'src/compiler/translator/BuiltIn_autogen.h', 'src/compiler/translator/BuiltIn_autogen.h',
'src/compiler/translator/ParseContext_autogen.h', 'src/compiler/translator/ParseContext_autogen.h',
'src/compiler/translator/SymbolTable_autogen.cpp', 'src/compiler/translator/SymbolTable_autogen.cpp',
'src/compiler/translator/SymbolTable_autogen.h',
'src/tests/compiler_tests/ImmutableString_test_autogen.cpp', 'src/tests/compiler_tests/ImmutableString_test_autogen.cpp',
], ],
'script': 'src/compiler/translator/gen_builtin_symbols.py', 'script': 'src/compiler/translator/gen_builtin_symbols.py',
......
src/compiler/translator/SymbolTable.cpp
...@@ -59,22 +59,6 @@ class TSymbolTable::TSymbolTableLevel ...@@ -59,22 +59,6 @@ class TSymbolTable::TSymbolTableLevel
bool mGlobalInvariant; bool mGlobalInvariant;
}; };
class TSymbolTable::TSymbolTableBuiltInLevel
{
public:
TSymbolTableBuiltInLevel() = default;
void insert(const TSymbol *symbol);
const TSymbol *find(const ImmutableString &name) const;
private:
using tLevel = TUnorderedMap<ImmutableString,
const TSymbol *,
ImmutableString::FowlerNollVoHash<sizeof(size_t)>>;
using tLevelPair = const tLevel::value_type;
tLevel mLevel;
};
bool TSymbolTable::TSymbolTableLevel::insert(TSymbol *symbol) bool TSymbolTable::TSymbolTableLevel::insert(TSymbol *symbol)
{ {
// returning true means symbol was added to the table // returning true means symbol was added to the table
...@@ -96,20 +80,6 @@ TSymbol *TSymbolTable::TSymbolTableLevel::find(const ImmutableString &name) cons ...@@ -96,20 +80,6 @@ TSymbol *TSymbolTable::TSymbolTableLevel::find(const ImmutableString &name) cons
return (*it).second; return (*it).second;
} }
void TSymbolTable::TSymbolTableBuiltInLevel::insert(const TSymbol *symbol)
{
mLevel.insert(tLevelPair(symbol->getMangledName(), symbol));
}
const TSymbol *TSymbolTable::TSymbolTableBuiltInLevel::find(const ImmutableString &name) const
{
tLevel::const_iterator it = mLevel.find(name);
if (it == mLevel.end())
return nullptr;
else
return (*it).second;
}
TSymbolTable::TSymbolTable() : mUniqueIdCounter(0), mShaderType(GL_FRAGMENT_SHADER) TSymbolTable::TSymbolTable() : mUniqueIdCounter(0), mShaderType(GL_FRAGMENT_SHADER)
{ {
} }
...@@ -126,12 +96,6 @@ bool TSymbolTable::atGlobalLevel() const ...@@ -126,12 +96,6 @@ bool TSymbolTable::atGlobalLevel() const
return mTable.size() == 1u; return mTable.size() == 1u;
} }
void TSymbolTable::pushBuiltInLevel()
{
mBuiltInTable.push_back(
std::unique_ptr<TSymbolTableBuiltInLevel>(new TSymbolTableBuiltInLevel));
}
void TSymbolTable::push() void TSymbolTable::push()
{ {
mTable.push_back(std::unique_ptr<TSymbolTableLevel>(new TSymbolTableLevel)); mTable.push_back(std::unique_ptr<TSymbolTableLevel>(new TSymbolTableLevel));
...@@ -208,31 +172,6 @@ const TSymbol *TSymbolTable::findBuiltIn(const ImmutableString &name, int shader ...@@ -208,31 +172,6 @@ const TSymbol *TSymbolTable::findBuiltIn(const ImmutableString &name, int shader
return findBuiltIn(name, shaderVersion, false); return findBuiltIn(name, shaderVersion, false);
} }
const TSymbol *TSymbolTable::findBuiltIn(const ImmutableString &name,
int shaderVersion,
bool includeGLSLBuiltins) const
{
for (int level = LAST_BUILTIN_LEVEL; level >= 0; level--)
{
if (level == GLSL_BUILTINS && !includeGLSLBuiltins)
level--;
if (level == ESSL3_1_BUILTINS && shaderVersion != 310)
level--;
if (level == ESSL3_BUILTINS && shaderVersion < 300)
level--;
if (level == ESSL1_BUILTINS && shaderVersion != 100)
level--;
const TSymbol *symbol = mBuiltInTable[level]->find(name);
if (symbol)
return symbol;
}
return nullptr;
}
bool TSymbolTable::declare(TSymbol *symbol) bool TSymbolTable::declare(TSymbol *symbol)
{ {
ASSERT(!mTable.empty()); ASSERT(!mTable.empty());
...@@ -252,14 +191,6 @@ void TSymbolTable::declareUserDefinedFunction(TFunction *function, bool insertUn ...@@ -252,14 +191,6 @@ void TSymbolTable::declareUserDefinedFunction(TFunction *function, bool insertUn
mTable[0]->insert(function); mTable[0]->insert(function);
} }
void TSymbolTable::insertBuiltIn(ESymbolLevel level, const TSymbol *symbol)
{
ASSERT(symbol);
ASSERT(level <= LAST_BUILTIN_LEVEL);
mBuiltInTable[level]->insert(symbol);
}
void TSymbolTable::setDefaultPrecision(TBasicType type, TPrecision prec) void TSymbolTable::setDefaultPrecision(TBasicType type, TPrecision prec)
{ {
int indexOfLastElement = static_cast<int>(mPrecisionStack.size()) - 1; int indexOfLastElement = static_cast<int>(mPrecisionStack.size()) - 1;
...@@ -329,13 +260,7 @@ void TSymbolTable::initializeBuiltIns(sh::GLenum type, ...@@ -329,13 +260,7 @@ void TSymbolTable::initializeBuiltIns(sh::GLenum type,
const ShBuiltInResources &resources) const ShBuiltInResources &resources)
{ {
mShaderType = type; mShaderType = type;
mResources = resources;
ASSERT(isEmpty());
pushBuiltInLevel(); // COMMON_BUILTINS
pushBuiltInLevel(); // ESSL1_BUILTINS
pushBuiltInLevel(); // ESSL3_BUILTINS
pushBuiltInLevel(); // ESSL3_1_BUILTINS
pushBuiltInLevel(); // GLSL_BUILTINS
// We need just one precision stack level for predefined precisions. // We need just one precision stack level for predefined precisions.
mPrecisionStack.push_back(std::unique_ptr<PrecisionStackLevel>(new PrecisionStackLevel)); mPrecisionStack.push_back(std::unique_ptr<PrecisionStackLevel>(new PrecisionStackLevel));
...@@ -368,8 +293,7 @@ void TSymbolTable::initializeBuiltIns(sh::GLenum type, ...@@ -368,8 +293,7 @@ void TSymbolTable::initializeBuiltIns(sh::GLenum type,
setDefaultPrecision(EbtAtomicCounter, EbpHigh); setDefaultPrecision(EbtAtomicCounter, EbpHigh);
insertBuiltInFunctions(type); initializeBuiltInVariables(type, spec, resources);
insertBuiltInVariables(type, spec, resources);
mUniqueIdCounter = kLastBuiltInId + 1; mUniqueIdCounter = kLastBuiltInId + 1;
} }
......
src/compiler/translator/SymbolTable.h
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include "compiler/translator/InfoSink.h" #include "compiler/translator/InfoSink.h"
#include "compiler/translator/IntermNode.h" #include "compiler/translator/IntermNode.h"
#include "compiler/translator/Symbol.h" #include "compiler/translator/Symbol.h"
#include "compiler/translator/SymbolTable_autogen.h"
namespace sh namespace sh
{ {
...@@ -60,7 +61,7 @@ struct UnmangledBuiltIn ...@@ -60,7 +61,7 @@ struct UnmangledBuiltIn
TExtension extension; TExtension extension;
}; };
class TSymbolTable : angle::NonCopyable class TSymbolTable : angle::NonCopyable, TSymbolTableBase
{ {
public: public:
TSymbolTable(); TSymbolTable();
...@@ -134,23 +135,16 @@ class TSymbolTable : angle::NonCopyable ...@@ -134,23 +135,16 @@ class TSymbolTable : angle::NonCopyable
friend class TSymbolUniqueId; friend class TSymbolUniqueId;
int nextUniqueIdValue(); int nextUniqueIdValue();
class TSymbolTableBuiltInLevel;
class TSymbolTableLevel; class TSymbolTableLevel;
void pushBuiltInLevel();
void insertBuiltIn(ESymbolLevel level, const TSymbol *symbol);
TFunction *findUserDefinedFunction(const ImmutableString &name) const; TFunction *findUserDefinedFunction(const ImmutableString &name) const;
void initSamplerDefaultPrecision(TBasicType samplerType); void initSamplerDefaultPrecision(TBasicType samplerType);
void insertBuiltInFunctions(sh::GLenum shaderType); void initializeBuiltInVariables(sh::GLenum shaderType,
void insertBuiltInVariables(sh::GLenum shaderType, ShShaderSpec spec,
ShShaderSpec spec, const ShBuiltInResources &resources);
const ShBuiltInResources &resources);
std::vector<std::unique_ptr<TSymbolTableBuiltInLevel>> mBuiltInTable;
std::vector<std::unique_ptr<TSymbolTableLevel>> mTable; std::vector<std::unique_ptr<TSymbolTableLevel>> mTable;
// There's one precision stack level for predefined precisions and then one level for each scope // There's one precision stack level for predefined precisions and then one level for each scope
...@@ -163,6 +157,7 @@ class TSymbolTable : angle::NonCopyable ...@@ -163,6 +157,7 @@ class TSymbolTable : angle::NonCopyable
static const int kLastBuiltInId; static const int kLastBuiltInId;
sh::GLenum mShaderType; sh::GLenum mShaderType;
ShBuiltInResources mResources;
}; };
} // namespace sh } // namespace sh
......
src/compiler/translator/SymbolTable_autogen.cpp
This source diff could not be displayed because it is too large. You can view the blob instead.
src/compiler/translator/SymbolTable_autogen.h 0 → 100644
// GENERATED FILE - DO NOT EDIT.
// Generated by gen_builtin_symbols.py using data from builtin_variables.json and
// builtin_function_declarations.txt.
//
// Copyright 2018 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.
//
// SymbolTable_autogen.h:
// Autogenerated member variables of TSymbolTable.
#ifndef COMPILER_TRANSLATOR_SYMBOLTABLE_AUTOGEN_H_
#define COMPILER_TRANSLATOR_SYMBOLTABLE_AUTOGEN_H_
namespace sh
{
class TSymbolTableBase
{
protected:
TSymbolTableBase() = default;
TStructure *mVar_gl_DepthRangeParameters = nullptr;
TVariable *mVar_gl_DepthRange = nullptr;
TVariable *mVar_gl_MaxVertexAttribs = nullptr;
TVariable *mVar_gl_MaxVertexUniformVectors = nullptr;
TVariable *mVar_gl_MaxVertexTextureImageUnits = nullptr;
TVariable *mVar_gl_MaxCombinedTextureImageUnits = nullptr;
TVariable *mVar_gl_MaxTextureImageUnits = nullptr;
TVariable *mVar_gl_MaxFragmentUniformVectors = nullptr;
TVariable *mVar_gl_MaxVaryingVectors = nullptr;
TVariable *mVar_gl_MaxDrawBuffers = nullptr;
TVariable *mVar_gl_MaxDualSourceDrawBuffersEXT = nullptr;
TVariable *mVar_gl_MaxVertexOutputVectors = nullptr;
TVariable *mVar_gl_MaxFragmentInputVectors = nullptr;
TVariable *mVar_gl_MinProgramTexelOffset = nullptr;
TVariable *mVar_gl_MaxProgramTexelOffset = nullptr;
TVariable *mVar_gl_MaxImageUnits = nullptr;
TVariable *mVar_gl_MaxVertexImageUniforms = nullptr;
TVariable *mVar_gl_MaxFragmentImageUniforms = nullptr;
TVariable *mVar_gl_MaxComputeImageUniforms = nullptr;
TVariable *mVar_gl_MaxCombinedImageUniforms = nullptr;
TVariable *mVar_gl_MaxCombinedShaderOutputResources = nullptr;
TVariable *mVar_gl_MaxComputeWorkGroupCount = nullptr;
TVariable *mVar_gl_MaxComputeWorkGroupSize = nullptr;
TVariable *mVar_gl_MaxComputeUniformComponents = nullptr;
TVariable *mVar_gl_MaxComputeTextureImageUnits = nullptr;
TVariable *mVar_gl_MaxComputeAtomicCounters = nullptr;
TVariable *mVar_gl_MaxComputeAtomicCounterBuffers = nullptr;
TVariable *mVar_gl_MaxVertexAtomicCounters = nullptr;
TVariable *mVar_gl_MaxFragmentAtomicCounters = nullptr;
TVariable *mVar_gl_MaxCombinedAtomicCounters = nullptr;
TVariable *mVar_gl_MaxAtomicCounterBindings = nullptr;
TVariable *mVar_gl_MaxVertexAtomicCounterBuffers = nullptr;
TVariable *mVar_gl_MaxFragmentAtomicCounterBuffers = nullptr;
TVariable *mVar_gl_MaxCombinedAtomicCounterBuffers = nullptr;
TVariable *mVar_gl_MaxAtomicCounterBufferSize = nullptr;
TVariable *mVar_gl_MaxGeometryInputComponents = nullptr;
TVariable *mVar_gl_MaxGeometryOutputComponents = nullptr;
TVariable *mVar_gl_MaxGeometryImageUniforms = nullptr;
TVariable *mVar_gl_MaxGeometryTextureImageUnits = nullptr;
TVariable *mVar_gl_MaxGeometryOutputVertices = nullptr;
TVariable *mVar_gl_MaxGeometryTotalOutputComponents = nullptr;
TVariable *mVar_gl_MaxGeometryUniformComponents = nullptr;
TVariable *mVar_gl_MaxGeometryAtomicCounters = nullptr;
TVariable *mVar_gl_MaxGeometryAtomicCounterBuffers = nullptr;
TVariable *mVar_gl_FragData = nullptr;
TVariable *mVar_gl_SecondaryFragDataEXT = nullptr;
TVariable *mVar_gl_FragDepthEXT = nullptr;
TVariable *mVar_gl_LastFragData = nullptr;
TVariable *mVar_gl_LastFragDataNV = nullptr;
TInterfaceBlock *mVar_gl_PerVertex = nullptr;
TVariable *mVar_gl_in = nullptr;
TVariable *mVar_gl_PositionGS = nullptr;
};
} // namespace sh
#endif // COMPILER_TRANSLATOR_SYMBOLTABLE_AUTOGEN_H_
src/compiler/translator/builtin_variables.json
...@@ -516,7 +516,7 @@ ...@@ -516,7 +516,7 @@
}, },
"subgroups":{ "subgroups":{
"EXTBlendFuncExtended":{ "EXTBlendFuncExtended":{
"condition":"resources.EXT_blend_func_extended", "condition":"mResources.EXT_blend_func_extended",
"variables":{ "variables":{
"gl_SecondaryFragColorEXT":{ "gl_SecondaryFragColorEXT":{
"level":"ESSL1_BUILTINS", "level":"ESSL1_BUILTINS",
...@@ -536,7 +536,7 @@ ...@@ -536,7 +536,7 @@
} }
}, },
"EXTFragDepth":{ "EXTFragDepth":{
"condition":"resources.EXT_frag_depth", "condition":"mResources.EXT_frag_depth",
"variables":{ "variables":{
"gl_FragDepthEXT":{ "gl_FragDepthEXT":{
"level":"ESSL1_BUILTINS", "level":"ESSL1_BUILTINS",
...@@ -546,7 +546,7 @@ ...@@ -546,7 +546,7 @@
} }
}, },
"EXTShaderFramebufferFetch":{ "EXTShaderFramebufferFetch":{
"condition":"resources.EXT_shader_framebuffer_fetch", "condition":"mResources.EXT_shader_framebuffer_fetch",
"variables":{ "variables":{
"gl_LastFragData":{ "gl_LastFragData":{
"level":"ESSL1_BUILTINS", "level":"ESSL1_BUILTINS",
...@@ -556,7 +556,7 @@ ...@@ -556,7 +556,7 @@
} }
}, },
"NVShaderFramebufferFetch":{ "NVShaderFramebufferFetch":{
"condition":"resources.NV_shader_framebuffer_fetch", "condition":"mResources.NV_shader_framebuffer_fetch",
"variables":{ "variables":{
"gl_LastFragColor":{ "gl_LastFragColor":{
"level":"ESSL1_BUILTINS", "level":"ESSL1_BUILTINS",
...@@ -577,7 +577,7 @@ ...@@ -577,7 +577,7 @@
} }
}, },
"ARMShaderFramebufferFetch":{ "ARMShaderFramebufferFetch":{
"condition":"!resources.EXT_shader_framebuffer_fetch && !resources.NV_shader_framebuffer_fetch && resources.ARM_shader_framebuffer_fetch", "condition":"!mResources.EXT_shader_framebuffer_fetch && !mResources.NV_shader_framebuffer_fetch && mResources.ARM_shader_framebuffer_fetch",
"variables":{ "variables":{
"gl_LastFragColorARM":{ "gl_LastFragColorARM":{
"level":"ESSL1_BUILTINS", "level":"ESSL1_BUILTINS",
...@@ -592,7 +592,7 @@ ...@@ -592,7 +592,7 @@
} }
}, },
"GeometryShaderSupported":{ "GeometryShaderSupported":{
"condition":"resources.EXT_geometry_shader", "condition":"mResources.EXT_geometry_shader",
"variables":{ "variables":{
"gl_PrimitiveID":{ "gl_PrimitiveID":{
"level":"ESSL3_1_BUILTINS", "level":"ESSL3_1_BUILTINS",
...@@ -821,7 +821,7 @@ ...@@ -821,7 +821,7 @@
} }
}, },
"Multiview":{ "Multiview":{
"condition":"resources.OVR_multiview && shaderType != GL_COMPUTE_SHADER", "condition":"mResources.OVR_multiview && shaderType != GL_COMPUTE_SHADER",
"subgroups":{ "subgroups":{
"ESSL3":{ "ESSL3":{
"variables":{ "variables":{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment