Disable deltaq-mode=3 multithreading and add tests There are still ASan errors and data races in deltaq-mode=3 multithreading code as shown by the tests below. Tested: test_libaom --gtest_filter=DeltaqModeTest.DeltaqMode3MultiThread test_libaom --gtest_filter=AV1MultiThreaded/AllIntraEndToEndTest.*/6 test_libaom --gtest_filter=AV1MultiThreaded/AllIntraEndToEndTest.*/7 You can add a multiple of 8 to the test number. For example, test_libaom --gtest_filter=AV1MultiThreaded/AllIntraEndToEndTest.*/14 test_libaom --gtest_filter=AV1MultiThreaded/AllIntraEndToEndTest.*/15 Bug: aomedia:3376 Bug: aomedia:3380 Change-Id: I5f7ec6cadebe19a2cc2663892c5afcbefbaa41e0 (cherry picked from commit 130d1a903d0d001cd2edb433bbcbeb3517a13ae0)
diff --git a/av1/encoder/allintra_vis.c b/av1/encoder/allintra_vis.c index b86d747..cfc3270 100644 --- a/av1/encoder/allintra_vis.c +++ b/av1/encoder/allintra_vis.c
@@ -472,7 +472,9 @@ enc_row_mt->sync_read_ptr = av1_row_mt_sync_read_dummy; enc_row_mt->sync_write_ptr = av1_row_mt_sync_write_dummy; // Calculate differential contrast for each block for the entire image. - if (num_workers > 1) { + // TODO(aomedia:3376): Remove " && 0" when there are no data races in + // av1_calc_mb_wiener_var_mt(). See also bug aomedia:3380. + if (num_workers > 1 && 0) { enc_row_mt->sync_read_ptr = av1_row_mt_sync_read; enc_row_mt->sync_write_ptr = av1_row_mt_sync_write; av1_calc_mb_wiener_var_mt(cpi, num_workers, &sum_rec_distortion,
diff --git a/test/allintra_end_to_end_test.cc b/test/allintra_end_to_end_test.cc index 0b9047c..98a7973 100644 --- a/test/allintra_end_to_end_test.cc +++ b/test/allintra_end_to_end_test.cc
@@ -132,4 +132,14 @@ ::testing::Range(5, 9), ::testing::Range(0, 4), ::testing::Values(1), ::testing::Values(1), ::testing::Values(0, 1)); + +INSTANTIATE_TEST_SUITE_P( + AV1MultiThreaded, AllIntraEndToEndTest, + ::testing::Combine( + ::testing::Values( + static_cast<const libaom_test::CodecFactory *>(&libaom_test::kAV1)), + ::testing::ValuesIn(kTestVectors), ::testing::Range(5, 9), + ::testing::Range(0, 4), ::testing::Values(6), ::testing::Values(1), + ::testing::Values(0, 1))); + } // namespace
diff --git a/test/deltaq_mode_test.cc b/test/deltaq_mode_test.cc new file mode 100644 index 0000000..0a5e5aa --- /dev/null +++ b/test/deltaq_mode_test.cc
@@ -0,0 +1,86 @@ +/* + * Copyright (c) 2023, Alliance for Open Media. All rights reserved + * + * This source code is subject to the terms of the BSD 2 Clause License and + * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License + * was not distributed with this source code in the LICENSE file, you can + * obtain it at www.aomedia.org/license/software. If the Alliance for Open + * Media Patent License 1.0 was not distributed with this source code in the + * PATENTS file, you can obtain it at www.aomedia.org/license/patent. + */ + +#include <cstddef> +#include <vector> + +#include "aom/aomcx.h" +#include "aom/aom_codec.h" +#include "aom/aom_encoder.h" +#include "aom/aom_image.h" +#include "third_party/googletest/src/googletest/include/gtest/gtest.h" + +namespace { + +/* + Reproduces https://crbug.com/aomedia/3376. Emulates the command line: + + ./aomenc --cpu-used=6 --threads=10 --cq-level=14 --passes=1 --limit=1 \ + --lag-in-frames=0 --end-usage=q --deltaq-mode=3 --min-q=0 --max-q=63 \ + -o output.av1 niklas_1280_720_30.y4m +*/ +TEST(DeltaqModeTest, DeltaqMode3MultiThread) { + constexpr int kWidth = 1280; + constexpr int kHeight = 720; + // Dummy buffer of neutral gray samples. + constexpr size_t kBufferSize = kWidth * kHeight + kWidth * kHeight / 2; + std::vector<unsigned char> buffer(kBufferSize, + static_cast<unsigned char>(128)); + + aom_image_t img; + EXPECT_EQ(&img, aom_img_wrap(&img, AOM_IMG_FMT_I420, kWidth, kHeight, 1, + buffer.data())); + + aom_codec_iface_t *iface = aom_codec_av1_cx(); + aom_codec_enc_cfg_t cfg; + EXPECT_EQ(aom_codec_enc_config_default(iface, &cfg, AOM_USAGE_GOOD_QUALITY), + AOM_CODEC_OK); + cfg.g_w = kWidth; + cfg.g_h = kHeight; + cfg.g_threads = 10; + cfg.rc_end_usage = AOM_Q; + cfg.g_profile = 0; + cfg.g_bit_depth = AOM_BITS_8; + cfg.g_input_bit_depth = 8; + cfg.g_lag_in_frames = 0; + cfg.rc_min_quantizer = 0; + cfg.rc_max_quantizer = 63; + cfg.g_pass = AOM_RC_ONE_PASS; + cfg.g_limit = 1; + aom_codec_ctx_t enc; + EXPECT_EQ(aom_codec_enc_init(&enc, iface, &cfg, 0), AOM_CODEC_OK); + EXPECT_EQ(aom_codec_control(&enc, AOME_SET_CPUUSED, 6), AOM_CODEC_OK); + EXPECT_EQ(aom_codec_control(&enc, AOME_SET_CQ_LEVEL, 14), AOM_CODEC_OK); + EXPECT_EQ(aom_codec_control(&enc, AV1E_SET_DELTAQ_MODE, 3), AOM_CODEC_OK); + EXPECT_EQ(aom_codec_set_option(&enc, "passes", "1"), AOM_CODEC_OK); + EXPECT_EQ(aom_codec_control(&enc, AV1E_SET_COLOR_RANGE, AOM_CR_STUDIO_RANGE), + AOM_CODEC_OK); + + EXPECT_EQ(aom_codec_encode(&enc, &img, 0, 1, 0), AOM_CODEC_OK); + aom_codec_iter_t iter = nullptr; + const aom_codec_cx_pkt_t *pkt = aom_codec_get_cx_data(&enc, &iter); + EXPECT_NE(pkt, nullptr); + EXPECT_EQ(pkt->kind, AOM_CODEC_CX_FRAME_PKT); + // pkt->data.frame.flags is 0x1f0011. + EXPECT_EQ(pkt->data.frame.flags & AOM_FRAME_IS_KEY, AOM_FRAME_IS_KEY); + pkt = aom_codec_get_cx_data(&enc, &iter); + EXPECT_EQ(pkt, nullptr); + + // Flush encoder + EXPECT_EQ(AOM_CODEC_OK, aom_codec_encode(&enc, nullptr, 0, 1, 0)); + iter = nullptr; + pkt = aom_codec_get_cx_data(&enc, &iter); + EXPECT_EQ(pkt, nullptr); + + EXPECT_EQ(AOM_CODEC_OK, aom_codec_destroy(&enc)); +} + +} // namespace
diff --git a/test/test.cmake b/test/test.cmake index ebf4404..a173246 100644 --- a/test/test.cmake +++ b/test/test.cmake
@@ -59,6 +59,7 @@ "${AOM_ROOT}/test/cpu_used_firstpass_test.cc" "${AOM_ROOT}/test/datarate_test.cc" "${AOM_ROOT}/test/datarate_test.h" + "${AOM_ROOT}/test/deltaq_mode_test.cc" "${AOM_ROOT}/test/svc_datarate_test.cc" "${AOM_ROOT}/test/encode_api_test.cc" "${AOM_ROOT}/test/encode_small_width_height_test.cc" @@ -112,6 +113,7 @@ "${AOM_ROOT}/test/borders_test.cc" "${AOM_ROOT}/test/cpu_speed_test.cc" "${AOM_ROOT}/test/cpu_used_firstpass_test.cc" + "${AOM_ROOT}/test/deltaq_mode_test.cc" "${AOM_ROOT}/test/end_to_end_psnr_test.cc" "${AOM_ROOT}/test/force_key_frame_test.cc" "${AOM_ROOT}/test/gf_pyr_height_test.cc"