Vulkan: Implement basic barrier perf test

scripts/perf_test_runner.py

@@ -18,8 +18,8 @@ import re
 
 base_path = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..'))
 
-# Might have to add lower case "release" in some configurations.
-perftests_paths = glob.glob('out/*Release*')
+# Look for a [Rr]elease build.
+perftests_paths = glob.glob('out/*elease*')
 metric = 'wall_time'
 max_experiments = 10
 

src/tests/angle_perftests.gni

@@ -25,6 +25,7 @@ angle_perf_tests_sources = [
   "perf_tests/TextureSampling.cpp",
   "perf_tests/TexturesPerf.cpp",
   "perf_tests/UniformsPerf.cpp",
+  "perf_tests/VulkanBarriersPerf.cpp",
   "perf_tests/third_party/perf/perf_test.cc",
   "perf_tests/third_party/perf/perf_test.h",
   "test_utils/angle_test_configs.cpp",

src/tests/gl_tests/PointSpritesTest.cpp

@@ -44,7 +44,7 @@ class PointSpritesTest : public ANGLETest
 
     float s2p(float s) { return (s + 1.0f) * 0.5f * (GLfloat)windowWidth; }
 
-    void testPointCoordAndPointSizeCompliance(priv::GLProgram program)
+    void testPointCoordAndPointSizeCompliance(GLProgram program)
     {
         glUseProgram(program);
 

src/tests/test_utils/gl_raii.h

@@ -128,9 +128,7 @@ class GLShader : angle::NonCopyable
     GLuint mHandle;
 };
 
-// Don't use GLProgram directly, use ANGLE_GL_PROGRAM.
-namespace priv
-{
+// Prefer ANGLE_GL_PROGRAM for local variables.
 class GLProgram
 {
   public:
@@ -182,40 +180,39 @@ class GLProgram
   private:
     GLuint mHandle;
 };
-}  // namespace priv
 
 #define ANGLE_GL_EMPTY_PROGRAM(name) \
-    priv::GLProgram name;            \
+    GLProgram name;                  \
     name.makeEmpty();                \
     ASSERT_TRUE(name.valid())
 
 #define ANGLE_GL_PROGRAM(name, vertex, fragment) \
-    priv::GLProgram name;                        \
+    GLProgram name;                              \
     name.makeRaster(vertex, fragment);           \
     ASSERT_TRUE(name.valid())
 
 #define ANGLE_GL_PROGRAM_WITH_GS(name, vertex, geometry, fragment) \
-    priv::GLProgram name;                                          \
+    GLProgram name;                                                \
     name.makeRaster(vertex, geometry, fragment);                   \
     ASSERT_TRUE(name.valid())
 
 #define ANGLE_GL_PROGRAM_TRANSFORM_FEEDBACK(name, vertex, fragment, tfVaryings, bufferMode) \
-    priv::GLProgram name;                                                                   \
+    GLProgram name;                                                                         \
     name.makeRasterWithTransformFeedback(vertex, fragment, tfVaryings, bufferMode);         \
     ASSERT_TRUE(name.valid())
 
 #define ANGLE_GL_COMPUTE_PROGRAM(name, compute) \
-    priv::GLProgram name;                       \
+    GLProgram name;                             \
     name.makeCompute(compute);                  \
     ASSERT_TRUE(name.valid())
 
 #define ANGLE_GL_BINARY_OES_PROGRAM(name, binary, binaryFormat) \
-    priv::GLProgram name;                                       \
+    GLProgram name;                                             \
     name.makeBinaryOES(binary, binaryFormat);                   \
     ASSERT_TRUE(name.valid())
 
 #define ANGLE_GL_BINARY_ES3_PROGRAM(name, binary, binaryFormat) \
-    priv::GLProgram name;                                       \
+    GLProgram name;                                             \
     name.makeBinaryES3(binary, binaryFormat);                   \
     ASSERT_TRUE(name.valid())