Hash :
ba319ba3
Author :
Date :
2018-12-29T10:29:33
Re-land "Load entry points dynamically in tests and samples." Fixes the Android/ChromeOS/Fuchsia builds by using consistent EGL headers. This CL adds a dynamic loader generator based on XML files. It also refactors the entry point generation script to move the XML parsing into a helper class. Additionally this includes a new GLES 1.0 base header. The new header allows for function pointer types and hiding prototypes. All tests and samples now load ANGLE dynamically. In the future this will be extended to load entry points from the driver directly when possible. This will allow us to perform more accurate A/B testing. The new build configuration leads to some tests having more warnings applied. The CL includes fixes for the new warnings. Bug: angleproject:2995 Change-Id: I5a8772f41a0f89570b3736b785f44b7de1539b57 Reviewed-on: https://chromium-review.googlesource.com/c/1392382 Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174
//
// Copyright (c) 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.
//
// DispatchComputePerf:
// Performance tests for ANGLE DispatchCompute call overhead.
//
#include "ANGLEPerfTest.h"
#include "util/shader_utils.h"
namespace
{
unsigned int kIterationsPerStep = 50;
struct DispatchComputePerfParams final : public RenderTestParams
{
DispatchComputePerfParams()
{
iterationsPerStep = kIterationsPerStep;
majorVersion = 3;
minorVersion = 1;
}
std::string suffix() const override;
unsigned int localSizeX = 16;
unsigned int localSizeY = 16;
unsigned int textureWidth = 32;
unsigned int textureHeight = 32;
};
std::string DispatchComputePerfParams::suffix() const
{
std::stringstream suffixStr;
suffixStr << RenderTestParams::suffix();
if (eglParameters.deviceType == EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE)
{
suffixStr << "_null";
}
return suffixStr.str();
}
std::ostream &operator<<(std::ostream &os, const DispatchComputePerfParams ¶ms)
{
os << params.suffix().substr(1);
return os;
}
class DispatchComputePerfBenchmark : public ANGLERenderTest,
public ::testing::WithParamInterface<DispatchComputePerfParams>
{
public:
DispatchComputePerfBenchmark();
void initializeBenchmark() override;
void destroyBenchmark() override;
void drawBenchmark() override;
private:
void initComputeShader();
void initTextures();
GLuint mProgram = 0;
GLuint mReadTexture = 0;
GLuint mWriteTexture = 0;
GLuint mDispatchX = 0;
GLuint mDispatchY = 0;
};
DispatchComputePerfBenchmark::DispatchComputePerfBenchmark()
: ANGLERenderTest("DispatchComputePerf", GetParam())
{}
void DispatchComputePerfBenchmark::initializeBenchmark()
{
const auto ¶ms = GetParam();
initComputeShader();
initTextures();
glUseProgram(mProgram);
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, mReadTexture);
glUniform1i(glGetUniformLocation(mProgram, "readTexture"), 0);
glBindImageTexture(4, mWriteTexture, 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_R32F);
mDispatchX = params.textureWidth / params.localSizeX;
mDispatchY = params.textureHeight / params.localSizeY;
ASSERT_GL_NO_ERROR();
}
void DispatchComputePerfBenchmark::initComputeShader()
{
constexpr char kCS[] = R"(#version 310 es
#define LOCAL_SIZE_X 16
#define LOCAL_SIZE_Y 16
layout(local_size_x=LOCAL_SIZE_X, local_size_y=LOCAL_SIZE_Y) in;
precision highp float;
uniform sampler2D readTexture;
layout(r32f, binding = 4) writeonly uniform highp image2D outImage;
void main() {
float sum = 0.;
sum += texelFetch(readTexture, ivec2(gl_GlobalInvocationID.xy), 0).r;
imageStore(outImage, ivec2(gl_GlobalInvocationID.xy), vec4(sum));
})";
mProgram = CompileComputeProgram(kCS, false);
ASSERT_NE(0u, mProgram);
}
void DispatchComputePerfBenchmark::initTextures()
{
const auto ¶ms = GetParam();
unsigned int textureDataSize = params.textureWidth * params.textureHeight;
std::vector<GLfloat> textureInputData(textureDataSize, 0.2f);
std::vector<GLfloat> textureOutputData(textureDataSize, 0.1f);
glGenTextures(1, &mReadTexture);
glBindTexture(GL_TEXTURE_2D, mReadTexture);
glTexImage2D(GL_TEXTURE_2D, 0, GL_R32F, params.textureWidth, params.textureHeight, 0, GL_RED,
GL_FLOAT, textureInputData.data());
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glGenTextures(1, &mWriteTexture);
glBindTexture(GL_TEXTURE_2D, mWriteTexture);
glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32F, params.textureWidth, params.textureHeight);
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, params.textureWidth, params.textureHeight, GL_RED,
GL_FLOAT, textureOutputData.data());
ASSERT_GL_NO_ERROR();
}
void DispatchComputePerfBenchmark::destroyBenchmark()
{
glDeleteProgram(mProgram);
glDeleteTextures(1, &mReadTexture);
glDeleteTextures(1, &mWriteTexture);
}
void DispatchComputePerfBenchmark::drawBenchmark()
{
const auto ¶ms = GetParam();
for (unsigned int it = 0; it < params.iterationsPerStep; it++)
{
glDispatchCompute(mDispatchX, mDispatchY, 1);
glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
}
ASSERT_GL_NO_ERROR();
}
DispatchComputePerfParams DispatchComputePerfOpenGLOrGLESParams(bool useNullDevice)
{
DispatchComputePerfParams params;
params.eglParameters = angle::egl_platform::OPENGL_OR_GLES(useNullDevice);
return params;
}
TEST_P(DispatchComputePerfBenchmark, Run)
{
run();
}
ANGLE_INSTANTIATE_TEST(DispatchComputePerfBenchmark,
DispatchComputePerfOpenGLOrGLESParams(true),
DispatchComputePerfOpenGLOrGLESParams(false));
} // namespace