Hash :
2f4a7518
Author :
Date :
2019-08-16T14:09:13
Refactor perf tests to fix metric/story swapping Refactors the perf tests to fix the issue of metric and story being swapped, which causes issues when trying to convert to histograms. Specifically, does the following: 1. Rolls the version of src/tests/perf_tests/third_party/perf/ to Chromium 476dae823269c8d05b544271af97ad1adb0db8ee 2. Switch to using PerfResultReporter instead of PrintResult directly. 3. Split RenderTestParams::suffix into backend and story; backend is used as part of the metric, while story is used as the story. 4. Remove the "average" metric that was being automatically reported by ANGLEPerfTest, as reported results are automatically averaged. 5. Update the reported metric to more clearly distinguish between test, backend, and metric. It is now name_backend.metric. e.g. DrawCallPerf_vulkan.wall_time. Bug: chromium:923564,chromium:924618 Change-Id: I00cc191407052f23df57dbfa53b6fb088fc26960 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1762360 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jonah Ryan-Davis <jonahr@google.com>
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 175
//
// Copyright 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 story() const override;
unsigned int localSizeX = 16;
unsigned int localSizeY = 16;
unsigned int textureWidth = 32;
unsigned int textureHeight = 32;
};
std::string DispatchComputePerfParams::story() const
{
std::stringstream storyStr;
storyStr << RenderTestParams::story();
if (eglParameters.deviceType == EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE)
{
storyStr << "_null";
}
return storyStr.str();
}
std::ostream &operator<<(std::ostream &os, const DispatchComputePerfParams ¶ms)
{
os << params.backendAndStory().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_FETCH_BARRIER_BIT);
}
ASSERT_GL_NO_ERROR();
}
DispatchComputePerfParams DispatchComputePerfOpenGLOrGLESParams(bool useNullDevice)
{
DispatchComputePerfParams params;
params.eglParameters = useNullDevice ? angle::egl_platform::OPENGL_OR_GLES_NULL()
: angle::egl_platform::OPENGL_OR_GLES();
return params;
}
TEST_P(DispatchComputePerfBenchmark, Run)
{
run();
}
ANGLE_INSTANTIATE_TEST(DispatchComputePerfBenchmark,
DispatchComputePerfOpenGLOrGLESParams(true),
DispatchComputePerfOpenGLOrGLESParams(false));
} // namespace