rtc: Delay top-right wait in row-mt for rtc mode
In row-mt multi-threading, a thread waits for the
encoding of the top-right superblock to be complete
before encoding the current superblock. This wait
time is reduced in rtc mode, by delaying the waiting
of threads until the need for the data from the
top-right superblock region.
Change-Id: Ibf9d50bd1b4032da39c2ca6e2bab287db7166fad
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 7566b07..52fa8b0 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -801,7 +801,11 @@
// Code each SB in the row
for (int mi_col = tile_info->mi_col_start, sb_col_in_tile = 0;
mi_col < tile_info->mi_col_end; mi_col += mib_size, sb_col_in_tile++) {
- (*(enc_row_mt->sync_read_ptr))(row_mt_sync, sb_row, sb_col_in_tile);
+ // In non-rd mode and when frequency of cost updates is off/tile, wait for
+ // the top superblock to finish encoding. Otherwise, wait for the top-right
+ // superblock to finish encoding.
+ (*(enc_row_mt->sync_read_ptr))(row_mt_sync, sb_row,
+ sb_col_in_tile - rtc_mode);
if (update_cdf && (tile_info->mi_row_start != mi_row)) {
if ((tile_info->mi_col_start == mi_col)) {
diff --git a/av1/encoder/partition_search.c b/av1/encoder/partition_search.c
index 77a9fe6..9383db4 100644
--- a/av1/encoder/partition_search.c
+++ b/av1/encoder/partition_search.c
@@ -1818,6 +1818,30 @@
av1_ref_frame_type(xd->mi[0]->ref_frame));
x->rdmult = origin_mult;
}
+
+static AOM_INLINE void wait_for_top_right_sb(
+ AV1EncRowMultiThreadInfo *enc_row_mt, AV1EncRowMultiThreadSync *row_mt_sync,
+ TileInfo *tile_info, BLOCK_SIZE sb_size, int sb_mi_size_log2,
+ BLOCK_SIZE bsize, int mi_row, int mi_col) {
+ const int sb_size_in_mi = mi_size_wide[sb_size];
+ const int bw_in_mi = mi_size_wide[bsize];
+ const int blk_row_in_sb = mi_row & (sb_size_in_mi - 1);
+ const int blk_col_in_sb = mi_col & (sb_size_in_mi - 1);
+ const int top_right_block_in_sb =
+ (blk_row_in_sb == 0) && (blk_col_in_sb + bw_in_mi >= sb_size_in_mi);
+
+ // Don't wait if the block is the not the top-right block in the superblock.
+ if (!top_right_block_in_sb) return;
+
+ // Wait for the top-right superblock to finish encoding.
+ const int sb_row_in_tile =
+ (mi_row - tile_info->mi_row_start) >> sb_mi_size_log2;
+ const int sb_col_in_tile =
+ (mi_col - tile_info->mi_col_start) >> sb_mi_size_log2;
+
+ (*(enc_row_mt->sync_read_ptr))(row_mt_sync, sb_row_in_tile, sb_col_in_tile);
+}
+
/*!\brief Top level function to pick block mode for non-RD optimized case
*
* \ingroup partition_search
@@ -1864,6 +1888,11 @@
const AQ_MODE aq_mode = cpi->oxcf.q_cfg.aq_mode;
TxfmSearchInfo *txfm_info = &x->txfm_search_info;
int i;
+
+ wait_for_top_right_sb(&cpi->mt_info.enc_row_mt, &tile_data->row_mt_sync,
+ &tile_data->tile_info, cm->seq_params.sb_size,
+ cm->seq_params.mib_size_log2, bsize, mi_row, mi_col);
+
#if CONFIG_COLLECT_COMPONENT_TIMING
start_timing(cpi, rd_pick_sb_modes_time);
#endif
