Make ANGLE's program hash key deterministic.

ANGLE's program hash iterates over hash maps which do not guarantee a determinisitic iteration order. Copy these maps to std::map before iteration. It's unclear what must change to make these maps iterate differently, EGLBlobCacheTest.Functional does cover this path but doesn't trigger any issues. Bug: angleproject:5913 Change-Id: Ib5f2c0a0a4e05cbaeeec5d9c889718d53c5fcf1c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2892254Reviewed-by: Sunny Sun <sunny.sun@arm.com> Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>

Make ANGLE's program hash key deterministic.
f97b8193 · Geoff Lang · Angle LUCI CQ · cf243705 · f97b8193 · f97b8193
Commit f97b8193 authored May 12, 2021 by Geoff Lang Committed by Angle LUCI CQ May 26, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 2 deletions

MemoryProgramCache.cpp src/libANGLE/MemoryProgramCache.cpp +2 -2

Program.cpp src/libANGLE/Program.cpp +10 -0

Program.h src/libANGLE/Program.h +4 -0

No files found.
--- a/src/libANGLE/MemoryProgramCache.cpp
+++ b/src/libANGLE/MemoryProgramCache.cpp
@@ -57,7 +57,7 @@ HashStream &operator<<(HashStream &stream, Shader *shader)

 HashStream &operator<<(HashStream &stream, const ProgramBindings &bindings)
 {
-    for (const auto &binding : bindings)
+    for (const auto &binding : bindings.getStableIterationMap())
    {
        stream << binding.first << binding.second;
    }
@@ -66,7 +66,7 @@ HashStream &operator<<(HashStream &stream, const ProgramBindings &bindings)

 HashStream &operator<<(HashStream &stream, const ProgramAliasedBindings &bindings)
 {
-    for (const auto &binding : bindings)
+    for (const auto &binding : bindings.getStableIterationMap())
    {
        stream << binding.first << binding.second.location;
    }

--- a/src/libANGLE/Program.cpp
+++ b/src/libANGLE/Program.cpp
@@ -1055,6 +1055,11 @@ ProgramBindings::const_iterator ProgramBindings::end() const
    return mBindings.end();
 }

+std::map<std::string, GLuint> ProgramBindings::getStableIterationMap() const
+{
+    return std::map<std::string, GLuint>(mBindings.begin(), mBindings.end());
+}
+
 // ProgramAliasedBindings implementation.
 ProgramAliasedBindings::ProgramAliasedBindings() {}

@@ -1148,6 +1153,11 @@ ProgramAliasedBindings::const_iterator ProgramAliasedBindings::end() const
    return mBindings.end();
 }

+std::map<std::string, ProgramBinding> ProgramAliasedBindings::getStableIterationMap() const
+{
+    return std::map<std::string, ProgramBinding>(mBindings.begin(), mBindings.end());
+}
+
 // ImageBinding implementation.
 ImageBinding::ImageBinding(size_t count, TextureType textureTypeIn)
    : textureType(textureTypeIn), boundImageUnits(count, 0)

--- a/src/libANGLE/Program.h
+++ b/src/libANGLE/Program.h
@@ -187,6 +187,8 @@ class ProgramBindings final : angle::NonCopyable
    const_iterator begin() const;
    const_iterator end() const;

+    std::map<std::string, GLuint> getStableIterationMap() const;
+
  private:
    angle::HashMap<std::string, GLuint> mBindings;
 };
@@ -207,6 +209,8 @@ class ProgramAliasedBindings final : angle::NonCopyable
    const_iterator begin() const;
    const_iterator end() const;

+    std::map<std::string, ProgramBinding> getStableIterationMap() const;
+
  private:
    angle::HashMap<std::string, ProgramBinding> mBindings;
 };