mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-10-09 08:47:31 +09:00
aom: update libaom to 0ec86ac7ae1e32a7e70410fa4972a655ec3670a4
This commit is contained in:
Roy Tam
parent
bc3f20e378
commit
eb361970c5
438 changed files with 52661 additions and 21905 deletions
174
third_party/aom/test/dr_prediction_test.cc
vendored
174
third_party/aom/test/dr_prediction_test.cc
vendored
|
|
@ -1,4 +1,4 @@
|
|||
/*
|
||||
/*
|
||||
* Copyright (c) 2018, Alliance for Open Media. All rights reserved
|
||||
*
|
||||
* This source code is subject to the terms of the BSD 2 Clause License and
|
||||
|
|
@ -135,7 +135,7 @@ struct DrPredFunc {
|
|||
template <typename Pixel, typename FuncType>
|
||||
class DrPredTest : public ::testing::TestWithParam<DrPredFunc<FuncType> > {
|
||||
protected:
|
||||
static const int kMaxNumTests = 100000;
|
||||
static const int kMaxNumTests = 10000;
|
||||
static const int kIterations = 10;
|
||||
static const int kDstStride = 64;
|
||||
static const int kDstSize = kDstStride * kDstStride;
|
||||
|
|
@ -162,6 +162,7 @@ class DrPredTest : public ::testing::TestWithParam<DrPredFunc<FuncType> > {
|
|||
|
||||
for (int i = 0; i < kDstSize; ++i) {
|
||||
dst_ref_[i] = 0;
|
||||
dst_tst_[i] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -170,7 +171,7 @@ class DrPredTest : public ::testing::TestWithParam<DrPredFunc<FuncType> > {
|
|||
void Predict(bool speedtest, int tx) {
|
||||
const int kNumTests = speedtest ? kMaxNumTests : 1;
|
||||
aom_usec_timer timer;
|
||||
|
||||
int tst_time = 0;
|
||||
aom_usec_timer_start(&timer);
|
||||
for (int k = 0; k < kNumTests; ++k) {
|
||||
params_.ref_fn(dst_ref_, dst_stride_, bw_, bh_, above_, left_,
|
||||
|
|
@ -179,32 +180,39 @@ class DrPredTest : public ::testing::TestWithParam<DrPredFunc<FuncType> > {
|
|||
aom_usec_timer_mark(&timer);
|
||||
const int ref_time = static_cast<int>(aom_usec_timer_elapsed(&timer));
|
||||
|
||||
aom_usec_timer_start(&timer);
|
||||
if (params_.tst_fn) {
|
||||
aom_usec_timer_start(&timer);
|
||||
for (int k = 0; k < kNumTests; ++k) {
|
||||
ASM_REGISTER_STATE_CHECK(params_.tst_fn(dst_tst_, dst_stride_, bw_, bh_,
|
||||
above_, left_, upsample_above_,
|
||||
upsample_left_, dx_, dy_, bd_));
|
||||
}
|
||||
aom_usec_timer_mark(&timer);
|
||||
tst_time = static_cast<int>(aom_usec_timer_elapsed(&timer));
|
||||
} else {
|
||||
for (int i = 0; i < kDstSize; ++i) {
|
||||
dst_ref_[i] = dst_tst_[i];
|
||||
}
|
||||
}
|
||||
aom_usec_timer_mark(&timer);
|
||||
const int tst_time = static_cast<int>(aom_usec_timer_elapsed(&timer));
|
||||
|
||||
OutputTimes(kNumTests, ref_time, tst_time, tx);
|
||||
}
|
||||
|
||||
void RunTest(bool speedtest, int p_angle) {
|
||||
for (int i = 0; i < kBufSize; ++i) {
|
||||
above_data_[i] = left_data_[i] = (1 << bd_) - 1;
|
||||
void RunTest(bool speedtest, bool needsaturation, int p_angle) {
|
||||
if (needsaturation) {
|
||||
for (int i = 0; i < kBufSize; ++i) {
|
||||
above_data_[i] = left_data_[i] = (1 << bd_) - 1;
|
||||
}
|
||||
}
|
||||
|
||||
for (int tx = 0; tx < TX_SIZES_ALL; ++tx) {
|
||||
if (params_.tst_fn == NULL) {
|
||||
for (int i = 0; i < kDstSize; ++i) {
|
||||
dst_tst_[i] = (1 << bd_) - 1;
|
||||
dst_ref_[i] = (1 << bd_) - 1;
|
||||
}
|
||||
} else {
|
||||
for (int i = 0; i < kDstSize; ++i) {
|
||||
dst_ref_[i] = 0;
|
||||
dst_tst_[i] = 0;
|
||||
}
|
||||
}
|
||||
|
|
@ -282,26 +290,11 @@ class DrPredTest : public ::testing::TestWithParam<DrPredFunc<FuncType> > {
|
|||
class LowbdDrPredTest : public DrPredTest<uint8_t, DrPred> {};
|
||||
|
||||
TEST_P(LowbdDrPredTest, SaturatedValues) {
|
||||
for (int iter = 0; iter < kIterations && !HasFatalFailure(); ++iter) {
|
||||
enable_upsample_ = iter & 1;
|
||||
for (enable_upsample_ = 0; enable_upsample_ < 2; ++enable_upsample_) {
|
||||
for (int angle = start_angle_; angle < stop_angle_; ++angle) {
|
||||
dx_ = av1_get_dx(angle);
|
||||
dy_ = av1_get_dy(angle);
|
||||
if (dx_ && dy_) RunTest(false, angle);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
TEST_P(LowbdDrPredTest, DISABLED_Speed) {
|
||||
const int angles[] = { 3, 45, 87 };
|
||||
for (enable_upsample_ = 0; enable_upsample_ < 2; ++enable_upsample_) {
|
||||
for (int i = 0; i < 3; ++i) {
|
||||
const int angle = angles[i] + start_angle_;
|
||||
dx_ = av1_get_dx(angle);
|
||||
dy_ = av1_get_dy(angle);
|
||||
printf("enable_upsample: %d angle: %d ~~~~~~~~~~~~~~~\n",
|
||||
enable_upsample_, angle);
|
||||
if (dx_ && dy_) RunTest(true, angle);
|
||||
if (dx_ && dy_) RunTest(false, true, angle);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -320,26 +313,11 @@ INSTANTIATE_TEST_CASE_P(
|
|||
class HighbdDrPredTest : public DrPredTest<uint16_t, DrPred_Hbd> {};
|
||||
|
||||
TEST_P(HighbdDrPredTest, SaturatedValues) {
|
||||
for (int iter = 0; iter < kIterations && !HasFatalFailure(); ++iter) {
|
||||
enable_upsample_ = iter & 1;
|
||||
for (enable_upsample_ = 0; enable_upsample_ < 2; ++enable_upsample_) {
|
||||
for (int angle = start_angle_; angle < stop_angle_; ++angle) {
|
||||
dx_ = av1_get_dx(angle);
|
||||
dy_ = av1_get_dy(angle);
|
||||
if (dx_ && dy_) RunTest(false, angle);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
TEST_P(HighbdDrPredTest, DISABLED_Speed) {
|
||||
const int angles[] = { 3, 45, 87 };
|
||||
for (enable_upsample_ = 0; enable_upsample_ < 2; ++enable_upsample_) {
|
||||
for (int i = 0; i < 3; ++i) {
|
||||
const int angle = angles[i] + start_angle_;
|
||||
dx_ = av1_get_dx(angle);
|
||||
dy_ = av1_get_dy(angle);
|
||||
printf("enable_upsample: %d angle: %d ~~~~~~~~~~~~~~~\n",
|
||||
enable_upsample_, angle);
|
||||
if (dx_ && dy_) RunTest(true, angle);
|
||||
if (dx_ && dy_) RunTest(false, true, angle);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -366,4 +344,112 @@ INSTANTIATE_TEST_CASE_P(
|
|||
DrPredFunc<DrPred_Hbd>(&z3_wrapper_hbd<av1_highbd_dr_prediction_z3_c>,
|
||||
NULL, AOM_BITS_12, kZ3Start)));
|
||||
|
||||
#if HAVE_AVX2
|
||||
INSTANTIATE_TEST_CASE_P(
|
||||
AVX2, LowbdDrPredTest,
|
||||
::testing::Values(DrPredFunc<DrPred>(&z1_wrapper<av1_dr_prediction_z1_c>,
|
||||
&z1_wrapper<av1_dr_prediction_z1_avx2>,
|
||||
AOM_BITS_8, kZ1Start),
|
||||
DrPredFunc<DrPred>(&z2_wrapper<av1_dr_prediction_z2_c>,
|
||||
&z2_wrapper<av1_dr_prediction_z2_avx2>,
|
||||
AOM_BITS_8, kZ2Start),
|
||||
DrPredFunc<DrPred>(&z3_wrapper<av1_dr_prediction_z3_c>,
|
||||
&z3_wrapper<av1_dr_prediction_z3_avx2>,
|
||||
AOM_BITS_8, kZ3Start)));
|
||||
|
||||
TEST_P(LowbdDrPredTest, DISABLED_Speed) {
|
||||
const int angles[] = { 3, 45, 87 };
|
||||
for (enable_upsample_ = 0; enable_upsample_ < 2; ++enable_upsample_) {
|
||||
for (int i = 0; i < 3; ++i) {
|
||||
const int angle = angles[i] + start_angle_;
|
||||
dx_ = av1_get_dx(angle);
|
||||
dy_ = av1_get_dy(angle);
|
||||
printf("enable_upsample: %d angle: %d ~~~~~~~~~~~~~~~\n",
|
||||
enable_upsample_, angle);
|
||||
if (dx_ && dy_) RunTest(true, false, angle);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
TEST_P(LowbdDrPredTest, OperationCheck) {
|
||||
if (params_.tst_fn == NULL) return;
|
||||
// const int angles[] = { 3, 45, 81, 87, 93, 100, 145, 187, 199, 260 };
|
||||
for (enable_upsample_ = 0; enable_upsample_ < 2; ++enable_upsample_) {
|
||||
for (int angle = start_angle_; angle < stop_angle_; ++angle) {
|
||||
dx_ = av1_get_dx(angle);
|
||||
dy_ = av1_get_dy(angle);
|
||||
if (dx_ && dy_) RunTest(false, false, angle);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(
|
||||
AVX2, HighbdDrPredTest,
|
||||
::testing::Values(DrPredFunc<DrPred_Hbd>(
|
||||
&z1_wrapper_hbd<av1_highbd_dr_prediction_z1_c>,
|
||||
&z1_wrapper_hbd<av1_highbd_dr_prediction_z1_avx2>,
|
||||
AOM_BITS_8, kZ1Start),
|
||||
DrPredFunc<DrPred_Hbd>(
|
||||
&z1_wrapper_hbd<av1_highbd_dr_prediction_z1_c>,
|
||||
&z1_wrapper_hbd<av1_highbd_dr_prediction_z1_avx2>,
|
||||
AOM_BITS_10, kZ1Start),
|
||||
DrPredFunc<DrPred_Hbd>(
|
||||
&z1_wrapper_hbd<av1_highbd_dr_prediction_z1_c>,
|
||||
&z1_wrapper_hbd<av1_highbd_dr_prediction_z1_avx2>,
|
||||
AOM_BITS_12, kZ1Start),
|
||||
/* TODO(https://crbug.com/aomedia/2288)
|
||||
DrPredFunc<DrPred_Hbd>(
|
||||
&z2_wrapper_hbd<av1_highbd_dr_prediction_z2_c>,
|
||||
&z2_wrapper_hbd<av1_highbd_dr_prediction_z2_avx2>,
|
||||
AOM_BITS_8, kZ2Start),
|
||||
DrPredFunc<DrPred_Hbd>(
|
||||
&z2_wrapper_hbd<av1_highbd_dr_prediction_z2_c>,
|
||||
&z2_wrapper_hbd<av1_highbd_dr_prediction_z2_avx2>,
|
||||
AOM_BITS_10, kZ2Start),
|
||||
DrPredFunc<DrPred_Hbd>(
|
||||
&z2_wrapper_hbd<av1_highbd_dr_prediction_z2_c>,
|
||||
&z2_wrapper_hbd<av1_highbd_dr_prediction_z2_avx2>,
|
||||
AOM_BITS_12, kZ2Start),
|
||||
*/
|
||||
DrPredFunc<DrPred_Hbd>(
|
||||
&z3_wrapper_hbd<av1_highbd_dr_prediction_z3_c>,
|
||||
&z3_wrapper_hbd<av1_highbd_dr_prediction_z3_avx2>,
|
||||
AOM_BITS_8, kZ3Start),
|
||||
DrPredFunc<DrPred_Hbd>(
|
||||
&z3_wrapper_hbd<av1_highbd_dr_prediction_z3_c>,
|
||||
&z3_wrapper_hbd<av1_highbd_dr_prediction_z3_avx2>,
|
||||
AOM_BITS_10, kZ3Start),
|
||||
DrPredFunc<DrPred_Hbd>(
|
||||
&z3_wrapper_hbd<av1_highbd_dr_prediction_z3_c>,
|
||||
&z3_wrapper_hbd<av1_highbd_dr_prediction_z3_avx2>,
|
||||
AOM_BITS_12, kZ3Start)));
|
||||
|
||||
TEST_P(HighbdDrPredTest, DISABLED_Speed) {
|
||||
const int angles[] = { 3, 45, 87 };
|
||||
for (enable_upsample_ = 0; enable_upsample_ < 2; ++enable_upsample_) {
|
||||
for (int i = 0; i < 3; ++i) {
|
||||
int angle = angles[i] + start_angle_;
|
||||
dx_ = av1_get_dx(angle);
|
||||
dy_ = av1_get_dy(angle);
|
||||
printf("enable_upsample: %d angle: %d ~~~~~~~~~~~~~~~\n",
|
||||
enable_upsample_, angle);
|
||||
if (dx_ && dy_) RunTest(true, false, angle);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
TEST_P(HighbdDrPredTest, OperationCheck) {
|
||||
if (params_.tst_fn == NULL) return;
|
||||
// const int angles[] = { 3, 45, 81, 87, 93, 100, 145, 187, 199, 260 };
|
||||
for (enable_upsample_ = 0; enable_upsample_ < 2; ++enable_upsample_) {
|
||||
for (int angle = start_angle_; angle < stop_angle_; angle++) {
|
||||
dx_ = av1_get_dx(angle);
|
||||
dy_ = av1_get_dy(angle);
|
||||
if (dx_ && dy_) RunTest(false, false, angle);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endif // HAVE_AVX2
|
||||
|
||||
} // namespace
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue