Skip to content

A
angle
Commit cc958e0e by Jamie Madill Committed by Commit Bot
Options

Remove D3D9 configs from perf tests.

We are not maintaining D3D9 for performance and reducing the number of perf tests will speed up the bots. Bug: angleproject:4943 Change-Id: Ib4ddad2cbfefcf6fccf3307df3bac7565ef246f4 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2352478Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 5276639d
Showing with 3 additions and 105 deletions
src/tests/perf_tests/BindingPerf.cpp
...@@ -193,14 +193,6 @@ BindingsParams D3D11Params(AllocationStyle allocationStyle) ...@@ -193,14 +193,6 @@ BindingsParams D3D11Params(AllocationStyle allocationStyle)
return params; return params;
} }
BindingsParams D3D9Params(AllocationStyle allocationStyle)
{
BindingsParams params;
params.eglParameters = egl_platform::D3D9_NULL();
params.allocationStyle = allocationStyle;
return params;
}
BindingsParams OpenGLOrGLESParams(AllocationStyle allocationStyle) BindingsParams OpenGLOrGLESParams(AllocationStyle allocationStyle)
{ {
BindingsParams params; BindingsParams params;
...@@ -225,8 +217,6 @@ TEST_P(BindingsBenchmark, Run) ...@@ -225,8 +217,6 @@ TEST_P(BindingsBenchmark, Run)
ANGLE_INSTANTIATE_TEST(BindingsBenchmark, ANGLE_INSTANTIATE_TEST(BindingsBenchmark,
D3D11Params(EVERY_ITERATION), D3D11Params(EVERY_ITERATION),
D3D11Params(AT_INITIALIZATION), D3D11Params(AT_INITIALIZATION),
D3D9Params(EVERY_ITERATION),
D3D9Params(AT_INITIALIZATION),
OpenGLOrGLESParams(EVERY_ITERATION), OpenGLOrGLESParams(EVERY_ITERATION),
OpenGLOrGLESParams(AT_INITIALIZATION), OpenGLOrGLESParams(AT_INITIALIZATION),
VulkanParams(EVERY_ITERATION), VulkanParams(EVERY_ITERATION),
......
src/tests/perf_tests/BufferSubData.cpp
...@@ -350,16 +350,6 @@ BufferSubDataParams BufferUpdateD3D11Params() ...@@ -350,16 +350,6 @@ BufferSubDataParams BufferUpdateD3D11Params()
return params; 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 BufferUpdateOpenGLOrGLESParams() BufferSubDataParams BufferUpdateOpenGLOrGLESParams()
{ {
BufferSubDataParams params; BufferSubDataParams params;
...@@ -387,7 +377,6 @@ TEST_P(BufferSubDataBenchmark, Run) ...@@ -387,7 +377,6 @@ TEST_P(BufferSubDataBenchmark, Run)
ANGLE_INSTANTIATE_TEST(BufferSubDataBenchmark, ANGLE_INSTANTIATE_TEST(BufferSubDataBenchmark,
BufferUpdateD3D11Params(), BufferUpdateD3D11Params(),
BufferUpdateD3D9Params(),
BufferUpdateOpenGLOrGLESParams(), BufferUpdateOpenGLOrGLESParams(),
BufferUpdateVulkanParams()); BufferUpdateVulkanParams());
......
src/tests/perf_tests/DrawCallPerfParams.h
...@@ -30,14 +30,6 @@ struct DrawCallPerfParams : public RenderTestParams ...@@ -30,14 +30,6 @@ struct DrawCallPerfParams : public RenderTestParams
namespace params namespace params
{ {
template <typename ParamsT> template <typename ParamsT>
ParamsT D3D9(const ParamsT &in)
{
ParamsT out = in;
out.eglParameters = angle::egl_platform::D3D9();
return out;
}
template <typename ParamsT>
ParamsT D3D11(const ParamsT &in) ParamsT D3D11(const ParamsT &in)
{ {
ParamsT out = in; ParamsT out = in;
......
src/tests/perf_tests/DynamicPromotionPerfTest.cpp
...@@ -166,19 +166,10 @@ DynamicPromotionParams DynamicPromotionD3D11Params() ...@@ -166,19 +166,10 @@ DynamicPromotionParams DynamicPromotionD3D11Params()
return params; return params;
} }
DynamicPromotionParams DynamicPromotionD3D9Params()
{
DynamicPromotionParams params;
params.eglParameters = egl_platform::D3D9();
return params;
}
TEST_P(DynamicPromotionPerfTest, Run) TEST_P(DynamicPromotionPerfTest, Run)
{ {
run(); run();
} }
ANGLE_INSTANTIATE_TEST(DynamicPromotionPerfTest, ANGLE_INSTANTIATE_TEST(DynamicPromotionPerfTest, DynamicPromotionD3D11Params());
DynamicPromotionD3D11Params(),
DynamicPromotionD3D9Params());
} // anonymous namespace } // anonymous namespace
src/tests/perf_tests/EGLMakeCurrentPerf.cpp
...@@ -147,14 +147,13 @@ TEST_P(EGLMakeCurrentPerfTest, Run) ...@@ -147,14 +147,13 @@ TEST_P(EGLMakeCurrentPerfTest, Run)
#if !defined(ANGLE_PLATFORM_ANDROID) #if !defined(ANGLE_PLATFORM_ANDROID)
ANGLE_INSTANTIATE_TEST(EGLMakeCurrentPerfTest, ANGLE_INSTANTIATE_TEST(EGLMakeCurrentPerfTest,
angle::ES2_D3D9(),
angle::ES2_D3D11(), angle::ES2_D3D11(),
angle::ES2_METAL(), angle::ES2_METAL(),
angle::ES2_OPENGL(), angle::ES2_OPENGL(),
angle::ES2_OPENGLES(), angle::ES2_OPENGLES(),
angle::ES2_VULKAN()); angle::ES2_VULKAN());
#else #else
ANGLE_INSTANTIATE_TEST(EGLMakeCurrentPerfTest, angle::ES2_D3D9(), angle::ES2_D3D11()); ANGLE_INSTANTIATE_TEST(EGLMakeCurrentPerfTest, angle::ES2_D3D11());
#endif #endif
} // namespace } // namespace
src/tests/perf_tests/InstancingPerf.cpp
...@@ -330,13 +330,6 @@ InstancingPerfParams InstancingPerfD3D11Params() ...@@ -330,13 +330,6 @@ InstancingPerfParams InstancingPerfD3D11Params()
return params; return params;
} }
InstancingPerfParams InstancingPerfD3D9Params()
{
InstancingPerfParams params;
params.eglParameters = D3D9();
return params;
}
InstancingPerfParams InstancingPerfOpenGLOrGLESParams() InstancingPerfParams InstancingPerfOpenGLOrGLESParams()
{ {
InstancingPerfParams params; InstancingPerfParams params;
...@@ -351,7 +344,6 @@ TEST_P(InstancingPerfBenchmark, Run) ...@@ -351,7 +344,6 @@ TEST_P(InstancingPerfBenchmark, Run)
ANGLE_INSTANTIATE_TEST(InstancingPerfBenchmark, ANGLE_INSTANTIATE_TEST(InstancingPerfBenchmark,
InstancingPerfD3D11Params(), InstancingPerfD3D11Params(),
InstancingPerfD3D9Params(),
InstancingPerfOpenGLOrGLESParams()); InstancingPerfOpenGLOrGLESParams());
} // anonymous namespace } // anonymous namespace
src/tests/perf_tests/InterleavedAttributeData.cpp
...@@ -212,20 +212,6 @@ InterleavedAttributeDataParams D3D11Params() ...@@ -212,20 +212,6 @@ InterleavedAttributeDataParams D3D11Params()
return params; return params;
} }
InterleavedAttributeDataParams D3D11_9_3Params()
{
InterleavedAttributeDataParams params;
params.eglParameters = egl_platform::D3D11_FL9_3();
return params;
}
InterleavedAttributeDataParams D3D9Params()
{
InterleavedAttributeDataParams params;
params.eglParameters = egl_platform::D3D9();
return params;
}
InterleavedAttributeDataParams OpenGLOrGLESParams() InterleavedAttributeDataParams OpenGLOrGLESParams()
{ {
InterleavedAttributeDataParams params; InterleavedAttributeDataParams params;
...@@ -242,8 +228,6 @@ InterleavedAttributeDataParams VulkanParams() ...@@ -242,8 +228,6 @@ InterleavedAttributeDataParams VulkanParams()
ANGLE_INSTANTIATE_TEST(InterleavedAttributeDataBenchmark, ANGLE_INSTANTIATE_TEST(InterleavedAttributeDataBenchmark,
D3D11Params(), D3D11Params(),
D3D11_9_3Params(),
D3D9Params(),
OpenGLOrGLESParams(), OpenGLOrGLESParams(),
VulkanParams()); VulkanParams());
......
src/tests/perf_tests/LinkProgramPerfTest.cpp
...@@ -181,13 +181,6 @@ LinkProgramParams LinkProgramD3D11Params(TaskOption taskOption, ThreadOption thr ...@@ -181,13 +181,6 @@ LinkProgramParams LinkProgramD3D11Params(TaskOption taskOption, ThreadOption thr
return params; return params;
} }
LinkProgramParams LinkProgramD3D9Params(TaskOption taskOption, ThreadOption threadOption)
{
LinkProgramParams params(taskOption, threadOption);
params.eglParameters = D3D9();
return params;
}
LinkProgramParams LinkProgramOpenGLOrGLESParams(TaskOption taskOption, ThreadOption threadOption) LinkProgramParams LinkProgramOpenGLOrGLESParams(TaskOption taskOption, ThreadOption threadOption)
{ {
LinkProgramParams params(taskOption, threadOption); LinkProgramParams params(taskOption, threadOption);
...@@ -210,19 +203,15 @@ TEST_P(LinkProgramBenchmark, Run) ...@@ -210,19 +203,15 @@ TEST_P(LinkProgramBenchmark, Run)
ANGLE_INSTANTIATE_TEST( ANGLE_INSTANTIATE_TEST(
LinkProgramBenchmark, LinkProgramBenchmark,
LinkProgramD3D11Params(TaskOption::CompileOnly, ThreadOption::MultiThread), LinkProgramD3D11Params(TaskOption::CompileOnly, ThreadOption::MultiThread),
LinkProgramD3D9Params(TaskOption::CompileOnly, ThreadOption::MultiThread),
LinkProgramOpenGLOrGLESParams(TaskOption::CompileOnly, ThreadOption::MultiThread), LinkProgramOpenGLOrGLESParams(TaskOption::CompileOnly, ThreadOption::MultiThread),
LinkProgramVulkanParams(TaskOption::CompileOnly, ThreadOption::MultiThread), LinkProgramVulkanParams(TaskOption::CompileOnly, ThreadOption::MultiThread),
LinkProgramD3D11Params(TaskOption::CompileAndLink, ThreadOption::MultiThread), LinkProgramD3D11Params(TaskOption::CompileAndLink, ThreadOption::MultiThread),
LinkProgramD3D9Params(TaskOption::CompileAndLink, ThreadOption::MultiThread),
LinkProgramOpenGLOrGLESParams(TaskOption::CompileAndLink, ThreadOption::MultiThread), LinkProgramOpenGLOrGLESParams(TaskOption::CompileAndLink, ThreadOption::MultiThread),
LinkProgramVulkanParams(TaskOption::CompileAndLink, ThreadOption::MultiThread), LinkProgramVulkanParams(TaskOption::CompileAndLink, ThreadOption::MultiThread),
LinkProgramD3D11Params(TaskOption::CompileOnly, ThreadOption::SingleThread), LinkProgramD3D11Params(TaskOption::CompileOnly, ThreadOption::SingleThread),
LinkProgramD3D9Params(TaskOption::CompileOnly, ThreadOption::SingleThread),
LinkProgramOpenGLOrGLESParams(TaskOption::CompileOnly, ThreadOption::SingleThread), LinkProgramOpenGLOrGLESParams(TaskOption::CompileOnly, ThreadOption::SingleThread),
LinkProgramVulkanParams(TaskOption::CompileOnly, ThreadOption::SingleThread), LinkProgramVulkanParams(TaskOption::CompileOnly, ThreadOption::SingleThread),
LinkProgramD3D11Params(TaskOption::CompileAndLink, ThreadOption::SingleThread), LinkProgramD3D11Params(TaskOption::CompileAndLink, ThreadOption::SingleThread),
LinkProgramD3D9Params(TaskOption::CompileAndLink, ThreadOption::SingleThread),
LinkProgramOpenGLOrGLESParams(TaskOption::CompileAndLink, ThreadOption::SingleThread), LinkProgramOpenGLOrGLESParams(TaskOption::CompileAndLink, ThreadOption::SingleThread),
LinkProgramVulkanParams(TaskOption::CompileAndLink, ThreadOption::SingleThread)); LinkProgramVulkanParams(TaskOption::CompileAndLink, ThreadOption::SingleThread));
......
src/tests/perf_tests/PointSprites.cpp
...@@ -201,13 +201,6 @@ PointSpritesParams D3D11Params() ...@@ -201,13 +201,6 @@ PointSpritesParams D3D11Params()
return params; return params;
} }
PointSpritesParams D3D9Params()
{
PointSpritesParams params;
params.eglParameters = egl_platform::D3D9();
return params;
}
PointSpritesParams OpenGLOrGLESParams() PointSpritesParams OpenGLOrGLESParams()
{ {
PointSpritesParams params; PointSpritesParams params;
...@@ -229,8 +222,4 @@ TEST_P(PointSpritesBenchmark, Run) ...@@ -229,8 +222,4 @@ TEST_P(PointSpritesBenchmark, Run)
run(); run();
} }
ANGLE_INSTANTIATE_TEST(PointSpritesBenchmark, ANGLE_INSTANTIATE_TEST(PointSpritesBenchmark, D3D11Params(), OpenGLOrGLESParams(), VulkanParams());
D3D11Params(),
D3D9Params(),
OpenGLOrGLESParams(),
VulkanParams());
src/tests/perf_tests/TextureSampling.cpp
...@@ -311,13 +311,6 @@ TextureSamplingParams D3D11Params() ...@@ -311,13 +311,6 @@ TextureSamplingParams D3D11Params()
return params; return params;
} }
TextureSamplingParams D3D9Params()
{
TextureSamplingParams params;
params.eglParameters = egl_platform::D3D9();
return params;
}
TextureSamplingParams OpenGLOrGLESParams() TextureSamplingParams OpenGLOrGLESParams()
{ {
TextureSamplingParams params; TextureSamplingParams params;
...@@ -346,7 +339,6 @@ TEST_P(TextureSamplingMutableFormatBenchmark, Run) ...@@ -346,7 +339,6 @@ TEST_P(TextureSamplingMutableFormatBenchmark, Run)
ANGLE_INSTANTIATE_TEST(TextureSamplingBenchmark, ANGLE_INSTANTIATE_TEST(TextureSamplingBenchmark,
D3D11Params(), D3D11Params(),
D3D9Params(),
OpenGLOrGLESParams(), OpenGLOrGLESParams(),
VulkanParams()); VulkanParams());
......
src/tests/perf_tests/TexturesPerf.cpp
...@@ -281,14 +281,6 @@ TexturesParams D3D11Params(bool webglCompat) ...@@ -281,14 +281,6 @@ TexturesParams D3D11Params(bool webglCompat)
return params; return params;
} }
TexturesParams D3D9Params(bool webglCompat)
{
TexturesParams params;
params.eglParameters = egl_platform::D3D9_NULL();
params.webgl = webglCompat;
return params;
}
TexturesParams OpenGLOrGLESParams(bool webglCompat) TexturesParams OpenGLOrGLESParams(bool webglCompat)
{ {
TexturesParams params; TexturesParams params;
...@@ -313,7 +305,6 @@ TEST_P(TexturesBenchmark, Run) ...@@ -313,7 +305,6 @@ TEST_P(TexturesBenchmark, Run)
ANGLE_INSTANTIATE_TEST(TexturesBenchmark, ANGLE_INSTANTIATE_TEST(TexturesBenchmark,
D3D11Params(false), D3D11Params(false),
D3D11Params(true), D3D11Params(true),
D3D9Params(true),
OpenGLOrGLESParams(false), OpenGLOrGLESParams(false),
OpenGLOrGLESParams(true), OpenGLOrGLESParams(true),
VulkanParams(false), VulkanParams(false),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment