Fixed tough texture upload benchmark on low end devices.

gpu/command_buffer/client/gles2_implementation.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // A class to emulate GLES2 over command buffers.
 
 #include "gpu/command_buffer/client/gles2_implementation.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 #include <GLES3/gl3.h>
 #include <algorithm>
 #include <map>
 #include <set>
 #include <sstream>
 #include <string>
 #include "base/compiler_specific.h"
 #include "base/strings/stringprintf.h"
+#include "base/sys_info.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/memory_allocator_dump.h"
 #include "base/trace_event/memory_dump_manager.h"
 #include "base/trace_event/process_memory_dump.h"
 #include "gpu/command_buffer/client/buffer_tracker.h"
 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
 #include "gpu/command_buffer/client/gpu_control.h"
 #include "gpu/command_buffer/client/program_info_manager.h"
 #include "gpu/command_buffer/client/query_tracker.h"
 #include "gpu/command_buffer/client/transfer_buffer.h"
@@ skipping 2265 matching lines @@
   }
 
   // Check if we can send it all at once.
   int32_t shm_id = 0;
   uint32_t shm_offset = 0;
   void* buffer_pointer = nullptr;
 
   ScopedTransferBufferPtr transfer_alloc(size, helper_, transfer_buffer_);
   ScopedMappedMemoryPtr mapped_alloc(0, helper_, mapped_memory_.get());
 
+  // Do not use more than 5% of extra shared memory, and do not use any
+  // extra for memory contrained devices (<1GB).
+  const int64_t physical_memory = base::SysInfo::AmountOfPhysicalMemory();
+  const uint32_t max_extra_transfer_buffer_size =
+      physical_memory > 1024 * 1024 * 1024
+          ? static_cast<uint32_t>(physical_memory / 20)
+          : 0;
+
   if (transfer_alloc.valid() && transfer_alloc.size() >= size) {
     shm_id = transfer_alloc.shm_id();
     shm_offset = transfer_alloc.offset();
     buffer_pointer = transfer_alloc.address();
-  } else {
+  } else if (size < max_extra_transfer_buffer_size) {
     mapped_alloc.Reset(size);
     if (mapped_alloc.valid()) {
       transfer_alloc.Discard();
 
       mapped_alloc.SetFlushAfterRelease(true);
       shm_id = mapped_alloc.shm_id();
       shm_offset = mapped_alloc.offset();
       buffer_pointer = mapped_alloc.address();
     }
   }
@@ skipping 101 matching lines @@
   }
 
   // Check if we can send it all at once.
   int32_t shm_id = 0;
   uint32_t shm_offset = 0;
   void* buffer_pointer = nullptr;
 
   ScopedTransferBufferPtr transfer_alloc(size, helper_, transfer_buffer_);
   ScopedMappedMemoryPtr mapped_alloc(0, helper_, mapped_memory_.get());
 
+  // Do not use more than 5% of extra shared memory, and do not use any
+  // extra for memory contrained devices (<1GB).
+  const int64_t physical_memory = base::SysInfo::AmountOfPhysicalMemory();
+  const uint32_t max_extra_transfer_buffer_size =

[no sievers, 2015/10/15 22:33:30]

can you make it a constant in this class?

[David Yen, 2015/10/15 23:01:54]

I made it a static constant instead for the file.

+      physical_memory > 1024 * 1024 * 1024
+          ? static_cast<uint32_t>(physical_memory / 20)
+          : 0;
+
   if (transfer_alloc.valid() && transfer_alloc.size() >= size) {
     shm_id = transfer_alloc.shm_id();
     shm_offset = transfer_alloc.offset();
     buffer_pointer = transfer_alloc.address();
-  } else {
+  } else if (size < max_extra_transfer_buffer_size) {
     mapped_alloc.Reset(size);
     if (mapped_alloc.valid()) {
       transfer_alloc.Discard();
 
       mapped_alloc.SetFlushAfterRelease(true);
       shm_id = mapped_alloc.shm_id();
       shm_offset = mapped_alloc.offset();
       buffer_pointer = mapped_alloc.address();
     }
   }
@@ skipping 3509 matching lines @@
   CheckGLError();
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/client/gles2_implementation_impl_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu