Hash :
8047f065
Author :
Date :
2015-12-15T17:54:42
Improve perf testing framework The ANGLERenderTest subclasses have a parameter "iterations". Previously most of these tests would perform iterations^2 iterations, since the looping was done both in ANGLERenderTest and in the individual test classes. Do the looping only in the individual test classes instead. This enables getting rid of separate beginDrawBenchmark() and endDrawBenchmark() functions. Some other unused code is also removed: 1. stepBenchmark function 2. unused parameters to step() This makes the core loop of running tests simpler. The perf testing framework also now has shared logic for deciding when to end a given test. The score calculation for tests is also changed. Instead of reporting just the number of operations done, it is reported relative to the actual run time of the test. This should make the test results more accurate, since run time of the tests may have some variation. It also enables changing the run time of the tests without rebaselining them. In the tests that use GPU, GPU operations are also waited to finish before stopping the timer. BUG=angleproject:1261 TEST=angle_perftests Change-Id: I69e9aad8afd2d9dedd60e144f0a5d4203618feef Reviewed-on: https://chromium-review.googlesource.com/319381 Tryjob-Request: Olli Etuaho <oetuaho@nvidia.com> Tested-by: Olli Etuaho <oetuaho@nvidia.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Zhenyao Mo <zmo@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 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418
//
// Copyright (c) 2014 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.
//
// BufferSubDataBenchmark:
// Performance test for ANGLE buffer updates.
//
#include <sstream>
#include "ANGLEPerfTest.h"
#include "shader_utils.h"
using namespace angle;
namespace
{
struct BufferSubDataParams final : public RenderTestParams
{
BufferSubDataParams()
{
// Common default values
majorVersion = 2;
minorVersion = 0;
windowWidth = 512;
windowHeight = 512;
updateSize = 3000;
bufferSize = 40000000;
iterations = 4;
updateRate = 1;
}
std::string suffix() const override;
GLboolean vertexNormalized;
GLenum vertexType;
GLint vertexComponentCount;
unsigned int updateRate;
// static parameters
GLsizeiptr updateSize;
GLsizeiptr bufferSize;
unsigned int iterations;
};
std::ostream &operator<<(std::ostream &os, const BufferSubDataParams ¶ms)
{
os << params.suffix().substr(1);
return os;
}
class BufferSubDataBenchmark : public ANGLERenderTest,
public ::testing::WithParamInterface<BufferSubDataParams>
{
public:
BufferSubDataBenchmark();
void initializeBenchmark() override;
void destroyBenchmark() override;
void drawBenchmark() override;
private:
GLuint mProgram;
GLuint mBuffer;
uint8_t *mUpdateData;
int mNumTris;
};
GLfloat *GetFloatData(GLint componentCount)
{
static GLfloat vertices2[] =
{
1, 2,
0, 0,
2, 0,
};
static GLfloat vertices3[] =
{
1, 2, 1,
0, 0, 1,
2, 0, 1,
};
static GLfloat vertices4[] =
{
1, 2, 1, 3,
0, 0, 1, 3,
2, 0, 1, 3,
};
switch (componentCount)
{
case 2:
return vertices2;
case 3:
return vertices3;
case 4:
return vertices4;
default:
return nullptr;
}
}
template <class T>
GLsizeiptr GetNormalizedData(GLsizeiptr numElements, GLfloat *floatData, std::vector<uint8_t> *data)
{
GLsizeiptr triDataSize = sizeof(T) * numElements;
data->resize(triDataSize);
T *destPtr = reinterpret_cast<T*>(data->data());
for (GLsizeiptr dataIndex = 0; dataIndex < numElements; dataIndex++)
{
GLfloat scaled = floatData[dataIndex] * 0.25f;
destPtr[dataIndex] = static_cast<T>(scaled * static_cast<GLfloat>(std::numeric_limits<T>::max()));
}
return triDataSize;
}
template <class T>
GLsizeiptr GetIntData(GLsizeiptr numElements, GLfloat *floatData, std::vector<uint8_t> *data)
{
GLsizeiptr triDataSize = sizeof(T) * numElements;
data->resize(triDataSize);
T *destPtr = reinterpret_cast<T*>(data->data());
for (GLsizeiptr dataIndex = 0; dataIndex < numElements; dataIndex++)
{
destPtr[dataIndex] = static_cast<T>(floatData[dataIndex]);
}
return triDataSize;
}
GLsizeiptr GetVertexData(GLenum type, GLint componentCount, GLboolean normalized, std::vector<uint8_t> *data)
{
GLsizeiptr triDataSize = 0;
GLfloat *floatData = GetFloatData(componentCount);
if (type == GL_FLOAT)
{
triDataSize = sizeof(GLfloat) * componentCount * 3;
data->resize(triDataSize);
memcpy(data->data(), floatData, triDataSize);
}
else if (normalized == GL_TRUE)
{
GLsizeiptr numElements = componentCount * 3;
switch (type)
{
case GL_BYTE:
triDataSize = GetNormalizedData<GLbyte>(numElements, floatData, data);
break;
case GL_SHORT:
triDataSize = GetNormalizedData<GLshort>(numElements, floatData, data);
break;
case GL_INT:
triDataSize = GetNormalizedData<GLint>(numElements, floatData, data);
break;
case GL_UNSIGNED_BYTE:
triDataSize = GetNormalizedData<GLubyte>(numElements, floatData, data);
break;
case GL_UNSIGNED_SHORT:
triDataSize = GetNormalizedData<GLushort>(numElements, floatData, data);
break;
case GL_UNSIGNED_INT:
triDataSize = GetNormalizedData<GLuint>(numElements, floatData, data);
break;
default:
assert(0);
}
}
else
{
GLsizeiptr numElements = componentCount * 3;
switch (type)
{
case GL_BYTE:
triDataSize = GetIntData<GLbyte>(numElements, floatData, data);
break;
case GL_SHORT:
triDataSize = GetIntData<GLshort>(numElements, floatData, data);
break;
case GL_INT:
triDataSize = GetIntData<GLint>(numElements, floatData, data);
break;
case GL_UNSIGNED_BYTE:
triDataSize = GetIntData<GLubyte>(numElements, floatData, data);
break;
case GL_UNSIGNED_SHORT:
triDataSize = GetIntData<GLushort>(numElements, floatData, data);
break;
case GL_UNSIGNED_INT:
triDataSize = GetIntData<GLuint>(numElements, floatData, data);
break;
default:
assert(0);
}
}
return triDataSize;
}
std::string BufferSubDataParams::suffix() const
{
std::stringstream strstr;
strstr << RenderTestParams::suffix();
if (vertexNormalized)
{
strstr << "_norm";
}
switch (vertexType)
{
case GL_FLOAT:
strstr << "_float";
break;
case GL_INT:
strstr << "_int";
break;
case GL_BYTE:
strstr << "_byte";
break;
case GL_SHORT:
strstr << "_short";
break;
case GL_UNSIGNED_INT:
strstr << "_uint";
break;
case GL_UNSIGNED_BYTE:
strstr << "_ubyte";
break;
case GL_UNSIGNED_SHORT:
strstr << "_ushort";
break;
default:
strstr << "_vunk_" << vertexType << "_";
break;
}
strstr << vertexComponentCount;
strstr << "_every" << updateRate;
return strstr.str();
}
BufferSubDataBenchmark::BufferSubDataBenchmark()
: ANGLERenderTest("BufferSubData", GetParam()),
mProgram(0),
mBuffer(0),
mUpdateData(nullptr),
mNumTris(0)
{
}
void BufferSubDataBenchmark::initializeBenchmark()
{
const auto ¶ms = GetParam();
ASSERT_LT(1, params.vertexComponentCount);
ASSERT_LT(0u, params.iterations);
const std::string vs = SHADER_SOURCE
(
attribute vec2 vPosition;
uniform float uScale;
uniform float uOffset;
void main()
{
gl_Position = vec4(vPosition * vec2(uScale) - vec2(uOffset), 0, 1);
}
);
const std::string fs = SHADER_SOURCE
(
precision mediump float;
void main()
{
gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
}
);
mProgram = CompileProgram(vs, fs);
ASSERT_NE(0u, mProgram);
// Use the program object
glUseProgram(mProgram);
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
std::vector<uint8_t> zeroData(params.bufferSize);
memset(&zeroData[0], 0, zeroData.size());
glGenBuffers(1, &mBuffer);
glBindBuffer(GL_ARRAY_BUFFER, mBuffer);
glBufferData(GL_ARRAY_BUFFER, params.bufferSize, &zeroData[0], GL_DYNAMIC_DRAW);
glVertexAttribPointer(0, params.vertexComponentCount, params.vertexType,
params.vertexNormalized, 0, 0);
glEnableVertexAttribArray(0);
if (params.updateSize > 0)
{
mUpdateData = new uint8_t[params.updateSize];
}
std::vector<uint8_t> data;
GLsizei triDataSize = static_cast<GLsizei>(GetVertexData(params.vertexType,
params.vertexComponentCount,
params.vertexNormalized, &data));
mNumTris = static_cast<int>(params.updateSize / triDataSize);
for (int i = 0, offset = 0; i < mNumTris; ++i)
{
memcpy(mUpdateData + offset, &data[0], triDataSize);
offset += triDataSize;
}
if (params.updateSize == 0)
{
mNumTris = 1;
glBufferSubData(GL_ARRAY_BUFFER, 0, data.size(), &data[0]);
}
// Set the viewport
glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
GLfloat scale = 0.5f;
GLfloat offset = 0.5f;
if (params.vertexNormalized == GL_TRUE)
{
scale = 2.0f;
offset = 0.5f;
}
glUniform1f(glGetUniformLocation(mProgram, "uScale"), scale);
glUniform1f(glGetUniformLocation(mProgram, "uOffset"), offset);
ASSERT_GL_NO_ERROR();
}
void BufferSubDataBenchmark::destroyBenchmark()
{
glDeleteProgram(mProgram);
glDeleteBuffers(1, &mBuffer);
SafeDeleteArray(mUpdateData);
}
void BufferSubDataBenchmark::drawBenchmark()
{
glClear(GL_COLOR_BUFFER_BIT);
const auto ¶ms = GetParam();
for (unsigned int it = 0; it < params.iterations; it++)
{
if (params.updateSize > 0 && ((getNumStepsPerformed() % params.updateRate) == 0))
{
glBufferSubData(GL_ARRAY_BUFFER, 0, params.updateSize, mUpdateData);
}
glDrawArrays(GL_TRIANGLES, 0, 3 * mNumTris);
}
ASSERT_GL_NO_ERROR();
}
BufferSubDataParams BufferUpdateD3D11Params()
{
BufferSubDataParams params;
params.eglParameters = egl_platform::D3D11();
params.vertexType = GL_FLOAT;
params.vertexComponentCount = 4;
params.vertexNormalized = GL_FALSE;
return params;
}
BufferSubDataParams BufferUpdateD3D9Params()
{
BufferSubDataParams params;
params.eglParameters = egl_platform::D3D9();
params.vertexType = GL_FLOAT;
params.vertexComponentCount = 4;
params.vertexNormalized = GL_FALSE;
return params;
}
BufferSubDataParams BufferUpdateOpenGLParams()
{
BufferSubDataParams params;
params.eglParameters = egl_platform::OPENGL();
params.vertexType = GL_FLOAT;
params.vertexComponentCount = 4;
params.vertexNormalized = GL_FALSE;
return params;
}
TEST_P(BufferSubDataBenchmark, Run)
{
run();
}
ANGLE_INSTANTIATE_TEST(BufferSubDataBenchmark,
BufferUpdateD3D11Params(), BufferUpdateD3D9Params(),
BufferUpdateOpenGLParams());
} // namespace