encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tint/resolver: Optimize node marking 

Use the new utils::Bitset to replace the much slower unordered_map.

Bug: tint:1613
Change-Id: I80503d2b897f754408c4ce14a221210d6abc18f7
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/96403
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: dan sinclair <dsinclair@google.com>
This commit is contained in:
Ben Clayton 2022-07-21 23:46:15 +00:00 committed by Dawn LUCI CQ
parent e43034bef2
commit af47388345
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tint/resolver/resolver.cc
View File

@ -105,6 +105,9 @@ bool Resolver::Resolve() {
builder_->Sem().Reserve(builder_->LastAllocatedNodeID()); builder_->Sem().Reserve(builder_->LastAllocatedNodeID());
// Pre-allocate the marked bitset with the total number of AST nodes.
marked_.Resize(builder_->ASTNodes().Count());
if (!DependencyGraph::Build(builder_->AST(), builder_->Symbols(), builder_->Diagnostics(), if (!DependencyGraph::Build(builder_->AST(), builder_->Symbols(), builder_->Diagnostics(),
dependencies_)) { dependencies_)) {
return false; return false;
@ -161,7 +164,7 @@ bool Resolver::ResolveInternal() {
bool result = true; bool result = true;
for (auto* node : builder_->ASTNodes().Objects()) { for (auto* node : builder_->ASTNodes().Objects()) {
if (marked_.count(node) == 0) { if (!marked_[node->node_id.value]) {
TINT_ICE(Resolver, diagnostics_) TINT_ICE(Resolver, diagnostics_)
<< "AST node '" << node->TypeInfo().name << "' was not reached by the resolver\n" << "AST node '" << node->TypeInfo().name << "' was not reached by the resolver\n"
<< "At: " << node->source << "\n" << "At: " << node->source << "\n"
@ -2842,7 +2845,9 @@ bool Resolver::Mark(const ast::Node* node) {
TINT_ICE(Resolver, diagnostics_) << "Resolver::Mark() called with nullptr"; TINT_ICE(Resolver, diagnostics_) << "Resolver::Mark() called with nullptr";
return false; return false;
} }
if (marked_.emplace(node).second) { auto marked_bit_ref = marked_[node->node_id.value];
if (!marked_bit_ref) {
marked_bit_ref = true;
return true; return true;
} }
TINT_ICE(Resolver, diagnostics_) << "AST node '" << node->TypeInfo().name TINT_ICE(Resolver, diagnostics_) << "AST node '" << node->TypeInfo().name

3
src/tint/resolver/resolver.h
View File

@ -35,6 +35,7 @@
#include "src/tint/sem/constant.h" #include "src/tint/sem/constant.h"
#include "src/tint/sem/function.h" #include "src/tint/sem/function.h"
#include "src/tint/sem/struct.h" #include "src/tint/sem/struct.h"
#include "src/tint/utils/bitset.h"
#include "src/tint/utils/unique_vector.h" #include "src/tint/utils/unique_vector.h"
// Forward declarations // Forward declarations
@ -420,7 +421,7 @@ class Resolver {
ast::Extensions enabled_extensions_; ast::Extensions enabled_extensions_;
std::vector<sem::Function*> entry_points_; std::vector<sem::Function*> entry_points_;
std::unordered_map<const sem::Type*, const Source&> atomic_composite_info_; std::unordered_map<const sem::Type*, const Source&> atomic_composite_info_;
std::unordered_set<const ast::Node*> marked_; utils::Bitset<0> marked_;
std::unordered_map<uint32_t, const sem::Variable*> constant_ids_; std::unordered_map<uint32_t, const sem::Variable*> constant_ids_;
std::unordered_map<ArrayConstructorSig, sem::CallTarget*> array_ctors_; std::unordered_map<ArrayConstructorSig, sem::CallTarget*> array_ctors_;
std::unordered_map<StructConstructorSig, sem::CallTarget*> struct_ctors_; std::unordered_map<StructConstructorSig, sem::CallTarget*> struct_ctors_;