kc3-lang/angle/src/libANGLE/renderer/vulkan/ResourceVk.cpp

• Show log

  Commit

• Hash : 68a5baeb
  Author :
  Date : 2020-09-23T22:13:03
  

  Revert "Vulkan: Implement a SharedResourceUse pool"
  
  This reverts commit de335c16855f11d1f0a6f0b37bee30c8a09a6c1d.
  
  Reason for revert: Might actually regress CPU overhead perf.
  Unsure but it's possible the reported perf improvement was due
  to variance.
  
  Original change's description:
  > Vulkan: Implement a SharedResourceUse pool
  > 
  > When adding a Resource to the ResourceUseList of ContextVk
  > we constructed a new SharedResourceUse object for tracking
  > and update of the Resource's Serial. We would then delete
  > it after releasing the resource. This incurs repeated
  > memory operation costs.
  > 
  > Instead we now allocate a pool of SharedResourceUse objects
  > and acquire and release from this pool as needed.
  > 
  > VTune profile of the Manhattan 30 offscreen benchmark
  > shows the CPU occupancy of bufferRead decrease from an
  > average of 0.9% -> 0.6% and imageRead decreases from
  > an average of 0.4% -> 0.3%. The bottleneck for both
  > these methods is the retain() method that leverages
  > the new SharedResourceUse pool.
  > 
  > Bug: angleproject:4950
  > Change-Id: Ib4f67c6f101d4b2de118014546e6cc14ad108703
  > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2396597
  > Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
  > Reviewed-by: Jamie Madill <jmadill@chromium.org>
  > Commit-Queue: Mohan Maiya <m.maiya@samsung.com>
  
  TBR=syoussefi@chromium.org,jmadill@chromium.org,m.maiya@samsung.com
  
  # Not skipping CQ checks because original CL landed > 1 day ago.
  
  Bug: angleproject:4950
  Change-Id: I40081551c3db67d6e55182fea40119946ed16ac3
  Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2426479
  Reviewed-by: Jamie Madill <jmadill@chromium.org>
  Commit-Queue: Jamie Madill <jmadill@chromium.org>
  

Download

• src/libANGLE/renderer/vulkan/ResourceVk.cpp

• //
  // Copyright 2017 The ANGLE Project Authors. All rights reserved.
  // Use of this source code is governed by a BSD-style license that can be
  // found in the LICENSE file.
  //
  // Resource:
  //    Resource lifetime tracking in the Vulkan back-end.
  //
  
  #include "libANGLE/renderer/vulkan/ResourceVk.h"
  
  #include "libANGLE/renderer/vulkan/ContextVk.h"
  
  namespace rx
  {
  namespace vk
  {
  // Resource implementation.
  Resource::Resource()
  {
      mUse.init();
  }
  
  Resource::Resource(Resource &&other) : Resource()
  {
      mUse = std::move(other.mUse);
  }
  
  Resource::~Resource()
  {
      mUse.release();
  }
  
  angle::Result Resource::finishRunningCommands(ContextVk *contextVk)
  {
      return contextVk->finishToSerial(mUse.getSerial());
  }
  
  angle::Result Resource::waitForIdle(ContextVk *contextVk, const char *debugMessage)
  {
      // If there are pending commands for the resource, flush them.
      if (usedInRecordedCommands())
      {
          ANGLE_TRY(contextVk->flushImpl(nullptr));
      }
  
      // Make sure the driver is done with the resource.
      if (usedInRunningCommands(contextVk->getLastCompletedQueueSerial()))
      {
          if (debugMessage)
          {
              ANGLE_PERF_WARNING(contextVk->getDebug(), GL_DEBUG_SEVERITY_HIGH, debugMessage);
          }
          ANGLE_TRY(finishRunningCommands(contextVk));
      }
  
      ASSERT(!isCurrentlyInUse(contextVk->getLastCompletedQueueSerial()));
  
      return angle::Result::Continue;
  }
  
  // SharedGarbage implementation.
  SharedGarbage::SharedGarbage() = default;
  
  SharedGarbage::SharedGarbage(SharedGarbage &&other)
  {
      *this = std::move(other);
  }
  
  SharedGarbage::SharedGarbage(SharedResourceUse &&use, std::vector<GarbageObject> &&garbage)
      : mLifetime(std::move(use)), mGarbage(std::move(garbage))
  {}
  
  SharedGarbage::~SharedGarbage() = default;
  
  SharedGarbage &SharedGarbage::operator=(SharedGarbage &&rhs)
  {
      std::swap(mLifetime, rhs.mLifetime);
      std::swap(mGarbage, rhs.mGarbage);
      return *this;
  }
  
  bool SharedGarbage::destroyIfComplete(RendererVk *renderer, Serial completedSerial)
  {
      if (mLifetime.isCurrentlyInUse(completedSerial))
          return false;
  
      for (GarbageObject &object : mGarbage)
      {
          object.destroy(renderer);
      }
  
      mLifetime.release();
  
      return true;
  }
  
  // ResourceUseList implementation.
  ResourceUseList::ResourceUseList()
  {
      constexpr size_t kDefaultResourceUseCount = 4096;
      mResourceUses.reserve(kDefaultResourceUseCount);
  }
  
  ResourceUseList::~ResourceUseList()
  {
      ASSERT(mResourceUses.empty());
  }
  
  void ResourceUseList::releaseResourceUses()
  {
      for (SharedResourceUse &use : mResourceUses)
      {
          use.release();
      }
  
      mResourceUses.clear();
  }
  
  void ResourceUseList::releaseResourceUsesAndUpdateSerials(Serial serial)
  {
      for (SharedResourceUse &use : mResourceUses)
      {
          use.releaseAndUpdateSerial(serial);
      }
  
      mResourceUses.clear();
  }
  }  // namespace vk
  }  // namespace rx
  

Download