SpirvShader: 2-way imported extensions lookup

The `extensions` map of ID -> extension has been renamed to `extensionsByID`. The `extensionsImported` is a new set containing the list of extension names that have been imported. This set can be efficiently queried to determine whether a particular extension is in use. Bug: b/145351270 Change-Id: I74bbfb2e5b95862c5381037f259262a9d45b6624 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/40092Tested-by: Ben Clayton <bclayton@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

SpirvShader: 2-way imported extensions lookup
8842c8f4 · Ben Clayton · c25e4d35 · 8842c8f4 · 8842c8f4
Commit 8842c8f4 authored Jan 13, 2020 by Ben Clayton
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

SpirvShader.cpp src/Pipeline/SpirvShader.cpp +2 -1

SpirvShader.hpp src/Pipeline/SpirvShader.hpp +4 -3

No files found.
--- a/src/Pipeline/SpirvShader.cpp
+++ b/src/Pipeline/SpirvShader.cpp
@@ -442,7 +442,8 @@ SpirvShader::SpirvShader(
 					UNSUPPORTED("SPIR-V Extension: %s", name);
 					break;
 				}
-				extensions.emplace(id, ext);
+				extensionsByID.emplace(id, ext);
+				extensionsImported.emplace(ext.name);
 				break;
 			}
 			case spv::OpName:

--- a/src/Pipeline/SpirvShader.hpp
+++ b/src/Pipeline/SpirvShader.hpp
@@ -748,7 +748,8 @@ private:
 	HandleMap<Object> defs;
 	HandleMap<Function> functions;
 	std::unordered_map<StringID, String> strings;
-	HandleMap<Extension> extensions;
+	HandleMap<Extension> extensionsByID;
+	std::unordered_set<Extension::Name> extensionsImported;
 	Function::ID entryPoint;
 	const bool robustBufferAccess = true;
@@ -1031,8 +1032,8 @@ private:
 	Extension const &getExtension(Extension::ID id) const
 	{
-		auto it = extensions.find(id);
+		auto it = extensionsByID.find(id);
-		ASSERT_MSG(it != extensions.end(), "Unknown extension %d", id.value());
+		ASSERT_MSG(it != extensionsByID.end(), "Unknown extension %d", id.value());
 		return it->second;
 	}