From 0dd2391f9fb4dd464fac8c144a45cf24189079fa Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Fri, 14 Sep 2018 11:20:14 +0100 Subject: COMPMID-1451: Move DragonBench tests with bias to nightlies Change-Id: If0675e55512c78230b5ec3708c6a809a03aa3752 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/148440 Reviewed-by: Anthony Barbier Tested-by: bsgcomp --- tests/benchmark/CL/DragonBench.cpp | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) (limited to 'tests/benchmark/CL') diff --git a/tests/benchmark/CL/DragonBench.cpp b/tests/benchmark/CL/DragonBench.cpp index d83878fa21..958639894f 100644 --- a/tests/benchmark/CL/DragonBench.cpp +++ b/tests/benchmark/CL/DragonBench.cpp @@ -47,9 +47,12 @@ namespace benchmark namespace { // Common DragonBench parameters -auto CommonParams = combine(combine(framework::dataset::make("DataType", { DataType::QASYMM8, DataType::F16, DataType::F32 }), - framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })), - framework::dataset::make("HasBias", { true, false })); +auto CommonParamsNoBias = combine(combine(framework::dataset::make("DataType", { DataType::QASYMM8, DataType::F16, DataType::F32 }), + framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })), + framework::dataset::make("HasBias", { false })); +auto CommonParamsBias = combine(combine(framework::dataset::make("DataType", { DataType::QASYMM8, DataType::F16, DataType::F32 }), + framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })), + framework::dataset::make("HasBias", { true })); } // namespace using CLDragonBenchConv2DFixture = DragonBenchConv2DFixture; @@ -61,21 +64,38 @@ TEST_SUITE(Conv2D) REGISTER_FIXTURE_DATA_TEST_CASE(SilverWing, CLDragonBenchConv2DFixture, framework::DatasetMode::ALL, - combine(datasets::DragonBenchDataset(silverwing_cfgs), CommonParams)); + combine(datasets::DragonBenchDataset(silverwing_cfgs), CommonParamsNoBias)); REGISTER_FIXTURE_DATA_TEST_CASE(SunFyre, CLDragonBenchConv2DFixture, framework::DatasetMode::ALL, - combine(datasets::DragonBenchDataset(sunfyre_cfgs), CommonParams)); + combine(datasets::DragonBenchDataset(sunfyre_cfgs), CommonParamsNoBias)); REGISTER_FIXTURE_DATA_TEST_CASE(Syrax, CLDragonBenchConv2DFixture, framework::DatasetMode::ALL, - combine(datasets::DragonBenchDataset(syrax_cfgs), CommonParams)); + combine(datasets::DragonBenchDataset(syrax_cfgs), CommonParamsNoBias)); -TEST_SUITE_END() -TEST_SUITE_END() -TEST_SUITE_END() +TEST_SUITE(Nightly) +REGISTER_FIXTURE_DATA_TEST_CASE(SilverWing, + CLDragonBenchConv2DFixture, + framework::DatasetMode::NIGHTLY, + combine(datasets::DragonBenchDataset(silverwing_cfgs), CommonParamsBias)); + +REGISTER_FIXTURE_DATA_TEST_CASE(SunFyre, + CLDragonBenchConv2DFixture, + framework::DatasetMode::NIGHTLY, + combine(datasets::DragonBenchDataset(sunfyre_cfgs), CommonParamsBias)); + +REGISTER_FIXTURE_DATA_TEST_CASE(Syrax, + CLDragonBenchConv2DFixture, + framework::DatasetMode::NIGHTLY, + combine(datasets::DragonBenchDataset(syrax_cfgs), CommonParamsBias)); +TEST_SUITE_END() // Nightly + +TEST_SUITE_END() // Conv2D +TEST_SUITE_END() // DragonBench +TEST_SUITE_END() // CL } // namespace benchmark } // namespace test } // namespace arm_compute -- cgit v1.2.1