commit f58f111fb3e36dfc395196f8dc8b16d69d6261c7
author Dominic Symes <dominic.symes@arm.com> Mon Sep 25 12:47:40 2017 +0200
committer Dominic Symes <dominic.symes@arm.com> Wed Sep 27 16:32:50 2017 +0000
tree fb28c654fc28fc9096365f6eff31ae7e315445dd
parent 84a6f201f5b1fcdf84c41729e6b867d1fd733b64

MAX_TILE experiment: add explicit tiles

This patch is designed to complete the CONFIG_MAX_TILE experiment.
It adds the following features:
- Explicit tiles of same width can be signalled with command line --tile_width
- Explicit tiles of same hieght can be signalled with command line --tile_height
- max_tile now works with the depenedent horizontal tiles experiment
- additional checking added to ensure maximum number of rows/columns <= 64
- one fix to the tile group code for when the number of tiles is not a power of two

Change-Id: I749a68fdb3dcdd8d1ced2b3558f3817e4b832c06

av1/common/tile_common.c

diff --git a/av1/common/tile_common.c b/av1/common/tile_common.c
index f73c39c..c3dedbf 100644
--- a/av1/common/tile_common.c
+++ b/av1/common/tile_common.c
@@ -26,6 +26,11 @@
     tile->tg_horz_boundary =
         (row == cm->tile_group_start_row[row][col] ? 1 : 0);
   }
+#if CONFIG_MAX_TILE
+  if (cm->tile_row_independent[row]) {
+    tile->tg_horz_boundary = 1;  // this tile row is independent
+  }
+#endif
 }
 #endif
 void av1_tile_init(TileInfo *tile, const AV1_COMMON *cm, int row, int col) {
@@ -53,8 +58,8 @@
   int sb_rows = mi_rows >> MAX_MIB_SIZE_LOG2;
 
   cm->min_log2_tile_cols = tile_log2(MAX_TILE_WIDTH_SB, sb_cols);
-  cm->max_log2_tile_cols = tile_log2(1, sb_cols);
-  cm->max_log2_tile_rows = tile_log2(1, sb_rows);
+  cm->max_log2_tile_cols = tile_log2(1, AOMMIN(sb_cols, MAX_TILE_COLS));
+  cm->max_log2_tile_rows = tile_log2(1, AOMMIN(sb_rows, MAX_TILE_ROWS));
   cm->min_log2_tiles = tile_log2(MAX_TILE_AREA_SB, sb_cols * sb_rows);
   cm->min_log2_tiles = AOMMAX(cm->min_log2_tiles, cm->min_log2_tile_cols);
   // TODO(dominic.symes@arm.com):
@@ -78,11 +83,13 @@
       start_sb += size_sb;
     }
     cm->tile_cols = i;
-    cm->tile_col_start_sb[i] = start_sb;
+    cm->tile_col_start_sb[i] = sb_cols;
     cm->min_log2_tile_rows = AOMMAX(cm->min_log2_tiles - cm->log2_tile_cols, 0);
+    cm->max_tile_height_sb = sb_rows >> cm->min_log2_tile_rows;
   } else {
     int max_tile_area_sb = (sb_rows * sb_cols);
     int max_tile_width_sb = 0;
+    cm->log2_tile_cols = tile_log2(1, cm->tile_cols);
     for (i = 0; i < cm->tile_cols; i++) {
       int size_sb = cm->tile_col_start_sb[i + 1] - cm->tile_col_start_sb[i];
       max_tile_width_sb = AOMMAX(max_tile_width_sb, size_sb);
@@ -108,10 +115,21 @@
       start_sb += size_sb;
     }
     cm->tile_rows = i;
-    cm->tile_row_start_sb[i] = start_sb;
+    cm->tile_row_start_sb[i] = sb_rows;
   } else {
-    // No action
+    cm->log2_tile_rows = tile_log2(1, cm->tile_rows);
   }
+
+#if CONFIG_DEPENDENT_HORZTILES
+  // Record which tile rows must be indpendent for parallelism
+  for (i = 0, start_sb = 0; i < cm->tile_rows; i++) {
+    cm->tile_row_independent[i] = 0;
+    if (cm->tile_row_start_sb[i + 1] - start_sb > cm->max_tile_height_sb) {
+      cm->tile_row_independent[i] = 1;
+      start_sb = cm->tile_row_start_sb[i];
+    }
+  }
+#endif
 }
 
 void av1_tile_set_row(TileInfo *tile, const AV1_COMMON *cm, int row) {