content/gpu: Groundwork for gpu stream priorities.

This CL adds support for gpu stream priorities. A stream gets its
priority when the first command buffer on that stream is created. The
stream exists until the last command buffer on that stream exists.

There are three priority levels: real-time, normal and low. Creating
streams with real-time priority requires the gpu channel to have that
capability.

There's some error checking so that clients do not set an incorrect
priority on an existing stream.

BUG=514813
R=piman@chromium.org

Review URL: https://codereview.chromium.org/1329513002

Cr-Commit-Position: refs/heads/master@{#347661}

1 files changed, 253 insertions, 16 deletions

diff --git a/content/common/gpu/gpu_channel_unittest.cc b/content/common/gpu/gpu_channel_unittest.cc
index 9d70b8d..f67ef1b 100644
--- a/content/common/gpu/gpu_channel_unittest.cc
+++ b/content/common/gpu/gpu_channel_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/test/test_simple_task_runner.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_channel_manager.h"
 #include "content/common/gpu/gpu_channel_test_common.h"
@@ -17,21 +18,23 @@ class GpuChannelTest : public GpuChannelTestCommon {
 };
 
 TEST_F(GpuChannelTest, CreateViewCommandBuffer) {
-  const int kClientId = 1;
-  const uint64 kClientTracingId = 1;
+  int32 kClientId = 1;
+  uint64 kClientTracingId = 1;
 
   ASSERT_TRUE(channel_manager());
 
-  EXPECT_TRUE(channel_manager()->OnMessageReceived(
-      GpuMsg_EstablishChannel(kClientId, kClientTracingId, false, false)));
+  EXPECT_TRUE(channel_manager()->OnMessageReceived(GpuMsg_EstablishChannel(
+      kClientId, kClientTracingId, false, false, false)));
   GpuChannel* channel = channel_manager()->LookupChannel(kClientId);
   ASSERT_TRUE(channel);
 
   gfx::GLSurfaceHandle surface_handle;
-  const int kSurfaceId = 1;
-  const int kRouteId = 1;
+  int32 kSurfaceId = 1;
+  int32 kRouteId = 1;
   GPUCreateCommandBufferConfig init_params;
   init_params.share_group_id = MSG_ROUTING_NONE;
+  init_params.stream_id = 0;
+  init_params.stream_priority = GpuStreamPriority::NORMAL;
   init_params.attribs = std::vector<int>();
   init_params.active_url = GURL();
   init_params.gpu_preference = gfx::PreferIntegratedGpu;
@@ -54,23 +57,24 @@ TEST_F(GpuChannelTest, CreateViewCommandBuffer) {
 }
 
 TEST_F(GpuChannelTest, IncompatibleStreamIds) {
-  const int kClientId = 1;
-  const uint64 kClientTracingId = 1;
+  int32 kClientId = 1;
+  uint64 kClientTracingId = 1;
 
   ASSERT_TRUE(channel_manager());
 
-  EXPECT_TRUE(channel_manager()->OnMessageReceived(
-      GpuMsg_EstablishChannel(kClientId, kClientTracingId, false, false)));
+  EXPECT_TRUE(channel_manager()->OnMessageReceived(GpuMsg_EstablishChannel(
+      kClientId, kClientTracingId, false, false, false)));
   GpuChannel* channel = channel_manager()->LookupChannel(kClientId);
   ASSERT_TRUE(channel);
 
   // Create first context.
-  const int kSurfaceId1 = 1;
-  const int kRouteId1 = 1;
-  const int kStreamId1 = 1;
+  int32 kSurfaceId1 = 1;
+  int32 kRouteId1 = 1;
+  int32 kStreamId1 = 1;
   GPUCreateCommandBufferConfig init_params;
   init_params.share_group_id = MSG_ROUTING_NONE;
   init_params.stream_id = kStreamId1;
+  init_params.stream_priority = GpuStreamPriority::NORMAL;
   init_params.attribs = std::vector<int>();
   init_params.active_url = GURL();
   init_params.gpu_preference = gfx::PreferIntegratedGpu;
@@ -92,12 +96,13 @@ TEST_F(GpuChannelTest, IncompatibleStreamIds) {
   ASSERT_TRUE(stub);
 
   // Create second context in same share group but different stream.
-  const int kSurfaceId2 = 2;
-  const int kRouteId2 = 2;
-  const int kStreamId2 = 2;
+  int32 kSurfaceId2 = 2;
+  int32 kRouteId2 = 2;
+  int32 kStreamId2 = 2;
 
   init_params.share_group_id = kRouteId1;
   init_params.stream_id = kStreamId2;
+  init_params.stream_priority = GpuStreamPriority::NORMAL;
   init_params.attribs = std::vector<int>();
   init_params.active_url = GURL();
   init_params.gpu_preference = gfx::PreferIntegratedGpu;
@@ -117,4 +122,236 @@ TEST_F(GpuChannelTest, IncompatibleStreamIds) {
   ASSERT_FALSE(stub);
 }
 
+TEST_F(GpuChannelTest, IncompatibleStreamPriorities) {
+  int32 kClientId = 1;
+  uint64 kClientTracingId = 1;
+
+  ASSERT_TRUE(channel_manager());
+
+  EXPECT_TRUE(channel_manager()->OnMessageReceived(GpuMsg_EstablishChannel(
+      kClientId, kClientTracingId, false, false, false)));
+  GpuChannel* channel = channel_manager()->LookupChannel(kClientId);
+  ASSERT_TRUE(channel);
+
+  // Create first context.
+  int32 kSurfaceId1 = 1;
+  int32 kRouteId1 = 1;
+  int32 kStreamId1 = 1;
+  GpuStreamPriority kStreamPriority1 = GpuStreamPriority::NORMAL;
+  GPUCreateCommandBufferConfig init_params;
+  init_params.share_group_id = MSG_ROUTING_NONE;
+  init_params.stream_id = kStreamId1;
+  init_params.stream_priority = kStreamPriority1;
+  init_params.attribs = std::vector<int>();
+  init_params.active_url = GURL();
+  init_params.gpu_preference = gfx::PreferIntegratedGpu;
+  channel_manager()->OnMessageReceived(GpuMsg_CreateViewCommandBuffer(
+      gfx::GLSurfaceHandle(), kSurfaceId1, kClientId, init_params, kRouteId1));
+
+  const IPC::Message* msg =
+      sink()->GetUniqueMessageMatching(GpuHostMsg_CommandBufferCreated::ID);
+  ASSERT_TRUE(msg);
+
+  base::Tuple<CreateCommandBufferResult> result;
+  ASSERT_TRUE(GpuHostMsg_CommandBufferCreated::Read(msg, &result));
+
+  EXPECT_EQ(CREATE_COMMAND_BUFFER_SUCCEEDED, base::get<0>(result));
+
+  sink()->ClearMessages();
+
+  GpuCommandBufferStub* stub = channel->LookupCommandBuffer(kRouteId1);
+  ASSERT_TRUE(stub);
+
+  // Create second context in same share group but different stream.
+  int32 kSurfaceId2 = 2;
+  int32 kRouteId2 = 2;
+  int32 kStreamId2 = kStreamId1;
+  GpuStreamPriority kStreamPriority2 = GpuStreamPriority::LOW;
+
+  init_params.share_group_id = MSG_ROUTING_NONE;
+  init_params.stream_id = kStreamId2;
+  init_params.stream_priority = kStreamPriority2;
+  init_params.attribs = std::vector<int>();
+  init_params.active_url = GURL();
+  init_params.gpu_preference = gfx::PreferIntegratedGpu;
+  channel_manager()->OnMessageReceived(GpuMsg_CreateViewCommandBuffer(
+      gfx::GLSurfaceHandle(), kSurfaceId2, kClientId, init_params, kRouteId2));
+
+  msg = sink()->GetUniqueMessageMatching(GpuHostMsg_CommandBufferCreated::ID);
+  ASSERT_TRUE(msg);
+
+  ASSERT_TRUE(GpuHostMsg_CommandBufferCreated::Read(msg, &result));
+
+  EXPECT_EQ(CREATE_COMMAND_BUFFER_FAILED, base::get<0>(result));
+
+  sink()->ClearMessages();
+
+  stub = channel->LookupCommandBuffer(kRouteId2);
+  ASSERT_FALSE(stub);
+}
+
+TEST_F(GpuChannelTest, StreamLifetime) {
+  int32 kClientId = 1;
+  uint64 kClientTracingId = 1;
+
+  ASSERT_TRUE(channel_manager());
+
+  EXPECT_TRUE(channel_manager()->OnMessageReceived(GpuMsg_EstablishChannel(
+      kClientId, kClientTracingId, false, false, false)));
+  GpuChannel* channel = channel_manager()->LookupChannel(kClientId);
+  ASSERT_TRUE(channel);
+
+  // Create first context.
+  int32 kSurfaceId1 = 1;
+  int32 kRouteId1 = 1;
+  int32 kStreamId1 = 1;
+  GpuStreamPriority kStreamPriority1 = GpuStreamPriority::NORMAL;
+  GPUCreateCommandBufferConfig init_params;
+  init_params.share_group_id = MSG_ROUTING_NONE;
+  init_params.stream_id = kStreamId1;
+  init_params.stream_priority = kStreamPriority1;
+  init_params.attribs = std::vector<int>();
+  init_params.active_url = GURL();
+  init_params.gpu_preference = gfx::PreferIntegratedGpu;
+  channel_manager()->OnMessageReceived(GpuMsg_CreateViewCommandBuffer(
+      gfx::GLSurfaceHandle(), kSurfaceId1, kClientId, init_params, kRouteId1));
+
+  const IPC::Message* msg =
+      sink()->GetUniqueMessageMatching(GpuHostMsg_CommandBufferCreated::ID);
+  ASSERT_TRUE(msg);
+
+  base::Tuple<CreateCommandBufferResult> result;
+  ASSERT_TRUE(GpuHostMsg_CommandBufferCreated::Read(msg, &result));
+
+  EXPECT_EQ(CREATE_COMMAND_BUFFER_SUCCEEDED, base::get<0>(result));
+
+  sink()->ClearMessages();
+
+  GpuCommandBufferStub* stub = channel->LookupCommandBuffer(kRouteId1);
+  ASSERT_TRUE(stub);
+
+  {
+    // GpuChannelHost always calls set_unblock(false) on messages sent to the
+    // GPU process.
+    IPC::Message m = GpuChannelMsg_DestroyCommandBuffer(kRouteId1);
+    m.set_unblock(false);
+    EXPECT_TRUE(channel->filter()->OnMessageReceived(m));
+    task_runner()->RunPendingTasks();
+  }
+
+  stub = channel->LookupCommandBuffer(kRouteId1);
+  ASSERT_FALSE(stub);
+
+  // Create second context in same share group but different stream.
+  int32 kSurfaceId2 = 2;
+  int32 kRouteId2 = 2;
+  int32 kStreamId2 = 2;
+  GpuStreamPriority kStreamPriority2 = GpuStreamPriority::LOW;
+
+  init_params.share_group_id = MSG_ROUTING_NONE;
+  init_params.stream_id = kStreamId2;
+  init_params.stream_priority = kStreamPriority2;
+  init_params.attribs = std::vector<int>();
+  init_params.active_url = GURL();
+  init_params.gpu_preference = gfx::PreferIntegratedGpu;
+  channel_manager()->OnMessageReceived(GpuMsg_CreateViewCommandBuffer(
+      gfx::GLSurfaceHandle(), kSurfaceId2, kClientId, init_params, kRouteId2));
+
+  msg = sink()->GetUniqueMessageMatching(GpuHostMsg_CommandBufferCreated::ID);
+  ASSERT_TRUE(msg);
+
+  ASSERT_TRUE(GpuHostMsg_CommandBufferCreated::Read(msg, &result));
+
+  EXPECT_EQ(CREATE_COMMAND_BUFFER_SUCCEEDED, base::get<0>(result));
+
+  sink()->ClearMessages();
+
+  stub = channel->LookupCommandBuffer(kRouteId2);
+  ASSERT_TRUE(stub);
+}
+
+TEST_F(GpuChannelTest, RealTimeStreamsDisallowed) {
+  int32 kClientId = 1;
+  uint64 kClientTracingId = 1;
+  bool allow_real_time_streams = false;
+
+  ASSERT_TRUE(channel_manager());
+
+  EXPECT_TRUE(channel_manager()->OnMessageReceived(GpuMsg_EstablishChannel(
+      kClientId, kClientTracingId, false, false, allow_real_time_streams)));
+  GpuChannel* channel = channel_manager()->LookupChannel(kClientId);
+  ASSERT_TRUE(channel);
+
+  // Create first context.
+  int32 kSurfaceId = 1;
+  int32 kRouteId = 1;
+  int32 kStreamId = 1;
+  GpuStreamPriority kStreamPriority = GpuStreamPriority::REAL_TIME;
+  GPUCreateCommandBufferConfig init_params;
+  init_params.share_group_id = MSG_ROUTING_NONE;
+  init_params.stream_id = kStreamId;
+  init_params.stream_priority = kStreamPriority;
+  init_params.attribs = std::vector<int>();
+  init_params.active_url = GURL();
+  init_params.gpu_preference = gfx::PreferIntegratedGpu;
+  channel_manager()->OnMessageReceived(GpuMsg_CreateViewCommandBuffer(
+      gfx::GLSurfaceHandle(), kSurfaceId, kClientId, init_params, kRouteId));
+
+  const IPC::Message* msg =
+      sink()->GetUniqueMessageMatching(GpuHostMsg_CommandBufferCreated::ID);
+  ASSERT_TRUE(msg);
+
+  base::Tuple<CreateCommandBufferResult> result;
+  ASSERT_TRUE(GpuHostMsg_CommandBufferCreated::Read(msg, &result));
+
+  EXPECT_EQ(CREATE_COMMAND_BUFFER_FAILED, base::get<0>(result));
+
+  sink()->ClearMessages();
+
+  GpuCommandBufferStub* stub = channel->LookupCommandBuffer(kRouteId);
+  ASSERT_FALSE(stub);
+}
+
+TEST_F(GpuChannelTest, RealTimeStreamsAllowed) {
+  int32 kClientId = 1;
+  uint64 kClientTracingId = 1;
+
+  ASSERT_TRUE(channel_manager());
+
+  bool allow_real_time_streams = true;
+  EXPECT_TRUE(channel_manager()->OnMessageReceived(GpuMsg_EstablishChannel(
+      kClientId, kClientTracingId, false, false, allow_real_time_streams)));
+  GpuChannel* channel = channel_manager()->LookupChannel(kClientId);
+  ASSERT_TRUE(channel);
+
+  // Create first context.
+  int32 kSurfaceId = 1;
+  int32 kRouteId = 1;
+  int32 kStreamId = 1;
+  GpuStreamPriority kStreamPriority = GpuStreamPriority::REAL_TIME;
+  GPUCreateCommandBufferConfig init_params;
+  init_params.share_group_id = MSG_ROUTING_NONE;
+  init_params.stream_id = kStreamId;
+  init_params.stream_priority = kStreamPriority;
+  init_params.attribs = std::vector<int>();
+  init_params.active_url = GURL();
+  init_params.gpu_preference = gfx::PreferIntegratedGpu;
+  channel_manager()->OnMessageReceived(GpuMsg_CreateViewCommandBuffer(
+      gfx::GLSurfaceHandle(), kSurfaceId, kClientId, init_params, kRouteId));
+
+  const IPC::Message* msg =
+      sink()->GetUniqueMessageMatching(GpuHostMsg_CommandBufferCreated::ID);
+  ASSERT_TRUE(msg);
+
+  base::Tuple<CreateCommandBufferResult> result;
+  ASSERT_TRUE(GpuHostMsg_CommandBufferCreated::Read(msg, &result));
+
+  EXPECT_EQ(CREATE_COMMAND_BUFFER_SUCCEEDED, base::get<0>(result));
+
+  sink()->ClearMessages();
+
+  GpuCommandBufferStub* stub = channel->LookupCommandBuffer(kRouteId);
+  ASSERT_TRUE(stub);
+}
+
 }  // namespace content