Changes call from AZ_TRACE to AZ_PROFILE. AZ_TRACE uses a driller bus that is going to be removed

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-12-02 17:12:25 -08:00
parent c5460c2064
commit 0b9497cd45
129 changed files with 92 additions and 261 deletions
@@ -17,7 +17,6 @@
 #include <AzCore/IO/SystemFile.h>
 #include <AzCore/std/chrono/chrono.h>
 #include <AzCore/std/string/conversions.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/StringFunc/StringFunc.h>

 #include <AzFramework/API/ApplicationAPI.h>
@@ -28,6 +27,8 @@
 #include <AzFramework/Asset/Benchmark/BenchmarkCommands.h>
 #include <AzFramework/Network/AssetProcessorConnection.h>

+AZ_DECLARE_BUDGET(AzFramework);
+
 namespace AzFramework
 {
    namespace AssetBenchmark
@@ -302,7 +303,7 @@ namespace AzFramework
        // SystemTickBus overrides
        void AssetSystemComponent::OnSystemTick()
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(AzFramework);
            LegacyAssetEventBus::ExecuteQueuedEvents();
        }

@@ -16,6 +16,7 @@
 #include <AzCore/Console/Console.h>
 #include <AzCore/IO/IStreamer.h>
 #include <AzCore/IO/SystemFile.h>
+#include <AzCore/Debug/Budget.h>
 #include <CryPath.h>
 #include <CrySystemBus.h>
 #include <CryCommon/IFont.h>
@@ -24,7 +25,6 @@
 #include <AzFramework/API/ApplicationAPI_Platform.h>
 #include <AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.h>
 #include <AzCore/Debug/Profiler.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/Debug/Trace.h>
 #include <AzCore/Debug/IEventLogger.h>
 #include <AzCore/Interface/Interface.h>
@@ -34,6 +34,7 @@
 #include <AzFramework/Entity/EntityDebugDisplayBus.h>
 #include <AzCore/Interface/Interface.h>

+AZ_DEFINE_BUDGET(CrySystem);

 #if defined(AZ_RESTRICTED_PLATFORM)
 #undef AZ_RESTRICTED_SECTION
@@ -525,7 +526,7 @@ void CSystem::SleepIfNeeded()
    int sleepMS = (int)(1000.0f * sleepTime + 0.5f);
    if (sleepMS > 0)
    {
-        AZ_PROFILE_FUNCTION(System);
+        AZ_PROFILE_FUNCTION(CrySystem);
        Sleep(sleepMS);
    }

@@ -564,7 +565,7 @@ bool CSystem::UpdatePreTickBus(int updateFlags, int nPauseMode)
    _mm_setcsr(_mm_getcsr() & ~0x280 | (g_cvars.sys_float_exceptions > 0 ? 0 : 0x280));
 #endif //WIN32

-    AZ_TRACE_METHOD();
+    AZ_PROFILE_FUNCTION(CrySystem);

 #ifndef EXCLUDE_UPDATE_ON_CONSOLE
    if (m_pUserCallback)
@@ -9,7 +9,8 @@

 #include "CrySystem_precompiled.h"
 #include "SystemEventDispatcher.h"
-#include <AzCore/Debug/EventTrace.h>
+
+AZ_DECLARE_BUDGET(CrySystem);

 CSystemEventDispatcher::CSystemEventDispatcher()
    : m_listeners(0)
@@ -72,7 +73,7 @@ void CSystemEventDispatcher::OnSystemEvent(ESystemEvent event, UINT_PTR wparam,
 //////////////////////////////////////////////////////////////////////////
 void CSystemEventDispatcher::Update()
 {
-    AZ_TRACE_METHOD();
+    AZ_PROFILE_FUNCTION(CrySystem);
    assert(gEnv && gEnv->mMainThreadId == CryGetCurrentThreadId());

    SEventParams params;
@@ -26,6 +26,7 @@
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Module/ModuleManagerBus.h>
+#include <AzCore/PlatformId/PlatformId.h>

 #include <TestFramework/AWSCoreFixture.h>
 #include <QSysInfo>
@@ -16,7 +16,6 @@
 #include <Atom/RPI.Public/Image/StreamingImagePool.h>
 #include <Atom/RPI.Reflect/Asset/AssetUtils.h>

-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/Debug/Trace.h>

 namespace
@@ -81,7 +80,7 @@ namespace AZ::Render

    void AcesDisplayMapperFeatureProcessor::Simulate(const FeatureProcessor::SimulatePacket& packet)
    {
-        AZ_TRACE_METHOD();
+        AZ_PROFILE_FUNCTION(AzRender);
        AZ_UNUSED(packet);
    }

@@ -11,7 +11,6 @@

 #include <Atom/RPI.Public/Scene.h>

-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/Math/Obb.h>
 #include <AzCore/Math/Matrix4x4.h>
 #include <AzCore/std/functional.h>
@@ -16,8 +16,6 @@

 #include <Atom/RPI.Public/View.h>

-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace Render
@@ -9,7 +9,6 @@
 #include "FixedShapeProcessor.h"
 #include "AuxGeomDrawProcessorShared.h"

-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/std/algorithm.h>
 #include <AzCore/std/containers/array.h>

@@ -8,8 +8,6 @@

 #include <CoreLights/CapsuleLightFeatureProcessor.h>

-#include <AzCore/Debug/EventTrace.h>
-
 #include <AzCore/Math/Vector3.h>
 #include <AzCore/Math/Color.h>

@@ -23,7 +23,6 @@
 #include <Atom/RPI.Public/Shader/ShaderSystemInterface.h>
 #include <AtomCore/Instance/Instance.h>
 #include <AzCore/Math/MatrixUtils.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/Math/Obb.h>

 namespace AZ
@@ -8,8 +8,6 @@

 #include <CoreLights/DiskLightFeatureProcessor.h>

-#include <AzCore/Debug/EventTrace.h>
-
 #include <AzCore/Math/Color.h>
 #include <AzCore/Math/Transform.h>
 #include <AzCore/Math/Vector3.h>
@@ -8,8 +8,6 @@

 #include <CoreLights/PointLightFeatureProcessor.h>

-#include <AzCore/Debug/EventTrace.h>
-
 #include <AzCore/Math/Vector3.h>
 #include <AzCore/Math/Color.h>

@@ -9,8 +9,6 @@
 #include <CoreLights/PolygonLightFeatureProcessor.h>
 #include <CoreLights/LtcCommon.h>

-#include <AzCore/Debug/EventTrace.h>
-
 #include <AzCore/Math/Vector3.h>
 #include <AzCore/Math/Color.h>

@@ -9,8 +9,6 @@
 #include <CoreLights/QuadLightFeatureProcessor.h>
 #include <CoreLights/LtcCommon.h>

-#include <AzCore/Debug/EventTrace.h>
-
 #include <AzCore/Math/Vector3.h>
 #include <AzCore/Math/Color.h>

@@ -8,8 +8,6 @@

 #include <CoreLights/SimplePointLightFeatureProcessor.h>

-#include <AzCore/Debug/EventTrace.h>
-
 #include <AzCore/Math/Vector3.h>
 #include <AzCore/Math/Color.h>

@@ -8,8 +8,6 @@

 #include <CoreLights/SimpleSpotLightFeatureProcessor.h>

-#include <AzCore/Debug/EventTrace.h>
-
 #include <AzCore/Math/Vector3.h>
 #include <AzCore/Math/Color.h>

@@ -8,8 +8,6 @@

 #include <Decals/DecalFeatureProcessor.h>

-#include <AzCore/Debug/EventTrace.h>
-
 #include <Atom/RHI/Factory.h>

 #include <Atom/RPI.Public/Image/ImageSystemInterface.h>
@@ -7,7 +7,6 @@
 */

 #include <Decals/DecalTextureArrayFeatureProcessor.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <Atom/RHI/Factory.h>
 #include <Atom/RPI.Public/RPISystemInterface.h>
 #include <Atom/RPI.Public/Material/Material.h>
@@ -29,8 +29,6 @@

 #include <Atom/Feature/ImGui/SystemBus.h>

-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace Render
@@ -11,8 +11,6 @@
 #include <Atom/RPI.Public/Scene.h>
 #include <Atom/RPI.Public/Image/StreamingImage.h>

-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace Render
@@ -24,7 +24,6 @@
 #include <AtomCore/Instance/InstanceDatabase.h>

 #include <AzCore/Console/IConsole.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/Jobs/Algorithms.h>
 #include <AzCore/Jobs/JobCompletion.h>
 #include <AzCore/Jobs/JobFunction.h>
@@ -7,7 +7,6 @@
 */


-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/Math/MathUtils.h>
 #include <AzCore/Serialization/SerializeContext.h>

@@ -7,7 +7,6 @@
 */


-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/Math/MathUtils.h>
 #include <AzCore/Serialization/SerializeContext.h>

@@ -6,7 +6,6 @@
 *
 */

-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/Math/MathUtils.h>
 #include <AzCore/Serialization/SerializeContext.h>

@@ -6,7 +6,6 @@
 *
 */

-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Utils/TypeHash.h>

@@ -15,8 +15,6 @@
 // Using ebus as a temporary workaround
 #include <AzFramework/Components/CameraBus.h>

-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace Render
@@ -7,7 +7,6 @@
 */


-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/Math/MathUtils.h>
 #include <AzCore/Serialization/SerializeContext.h>

@@ -15,7 +15,6 @@

 #include <Atom/RHI/FrameScheduler.h>

-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/Debug/Trace.h>
 #include <AzCore/Component/TickBus.h>

@@ -12,8 +12,6 @@
 #include <PostProcessing/SMAABlendingWeightCalculationPass.h>
 #include <PostProcessing/SMAANeighborhoodBlendingPass.h>

-#include <AzCore/Debug/EventTrace.h>
-
 #include <Atom/RHI/Factory.h>

 #include <Atom/RPI.Public/Pass/PassFilter.h>
@@ -66,7 +64,7 @@ namespace AZ

        void SMAAFeatureProcessor::Simulate(const FeatureProcessor::SimulatePacket& packet)
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(AzRender);
            AZ_UNUSED(packet);
        }

@@ -7,7 +7,6 @@
 */

 #include <RayTracing/RayTracingFeatureProcessor.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <Atom/Feature/TransformService/TransformServiceFeatureProcessor.h>
 #include <Atom/RHI/Factory.h>
 #include <Atom/RHI/RHISystemInterface.h>
@@ -7,7 +7,6 @@
 */

 #include <ReflectionProbe/ReflectionProbe.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <Atom/Feature/ReflectionProbe/ReflectionProbeFeatureProcessor.h>
 #include <Atom/RHI/RHISystemInterface.h>
 #include <Atom/RPI.Public/Pass/Pass.h>
@@ -17,8 +17,6 @@
 #include <Atom/RHI/RHISystemInterface.h>
 #include <Atom/RHI/PipelineState.h>
 #include <Atom/RHI.Reflect/InputStreamLayoutBuilder.h>
-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace Render
@@ -6,7 +6,6 @@
 *
 */

-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/Math/MathUtils.h>
 #include <AzCore/Serialization/SerializeContext.h>

@@ -8,7 +8,6 @@

 #include <Shadows/ProjectedShadowFeatureProcessor.h>

-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/Math/MatrixUtils.h>
 #include <Math/GaussianMathFilter.h>
 #include <Atom/RPI.Public/RenderPipeline.h>
@@ -25,7 +25,6 @@

 #include <Atom/RHI/CommandList.h>

-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/Jobs/JobCompletion.h>
 #include <AzCore/Jobs/JobFunction.h>
 #include <AzCore/RTTI/TypeInfo.h>
@@ -18,8 +18,6 @@
 #include <Atom/RPI.Public/Shader/Shader.h>

 #include <Atom/Utils/Utils.h>
-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace Render
@@ -35,7 +33,7 @@ namespace AZ

        bool SkinnedMeshRenderProxy::Init(const RPI::Scene& scene, SkinnedMeshFeatureProcessor* featureProcessor)
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(AzRender);
            if(!m_instance->m_model)
            {
                return false;
@@ -8,8 +8,6 @@

 #include <SkyBox/SkyBoxFeatureProcessor.h>

-#include <AzCore/Debug/EventTrace.h>
-
 #include <AzFramework/Asset/AssetSystemBus.h>

 #include <Atom/RHI/Factory.h>
@@ -190,7 +188,7 @@ namespace AZ

        void SkyBoxFeatureProcessor::Render(const FeatureProcessor::RenderPacket& packet)
        {
-             AZ_TRACE_METHOD();
+             AZ_PROFILE_FUNCTION(AzRender);
             AZ_UNUSED(packet);
        }

@@ -14,7 +14,6 @@
 #include <Atom/RPI.Public/Scene.h>
 #include <Atom/Utils/Utils.h>

-#include <AzCore/Debug/EventTrace.h>
 #include <cinttypes>

 namespace AZ
@@ -12,8 +12,6 @@
 #include <Atom/RHI/MemoryAllocation.h>
 #include <Atom/RHI.Reflect/MemoryEnums.h>

-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace RHI
@@ -96,7 +94,7 @@ namespace AZ
        template <class Traits>
        typename MemorySubAllocator<Traits>::memory_allocation MemorySubAllocator<Traits>::Allocate(size_t sizeInBytes, size_t alignmentInBytes)
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);
            if (RHI::AlignUp(sizeInBytes, alignmentInBytes) > m_descriptor.m_capacityInBytes)
            {
                return memory_allocation();
@@ -13,7 +13,6 @@
 #include <Atom/RHI.Reflect/TransientBufferDescriptor.h>
 #include <Atom/RHI.Reflect/TransientImageDescriptor.h>
 #include <Atom/RHI/MemoryStatisticsBuilder.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/std/sort.h>

 namespace AZ
@@ -8,8 +8,6 @@

 #include <Atom/RHI/BufferPool.h>
 #include <Atom/RHI/MemoryStatisticsBuilder.h>
-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace RHI
@@ -119,7 +117,7 @@ namespace AZ

        ResultCode BufferPool::InitBuffer(const BufferInitRequest& initRequest)
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);

            if (!ValidateInitRequest(initRequest))
            {
@@ -168,7 +166,7 @@ namespace AZ

        ResultCode BufferPool::MapBuffer(const BufferMapRequest& request, BufferMapResponse& response)
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);

            if (!ValidateIsInitialized() || !ValidateNotProcessingFrame())
            {
@@ -19,8 +19,6 @@
 #include <Atom/RHI/ScopeAttachment.h>
 #include <Atom/RHI/FrameAttachment.h>
 #include <Atom/RHI.Reflect/PipelineLayoutDescriptor.h>
-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace RHI
@@ -31,7 +29,7 @@ namespace AZ
            {
                return;
            }
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);
            AZ_Assert(m_scope == nullptr, "BeginScope called twice.");
            m_scope = &scope;

@@ -58,7 +56,7 @@ namespace AZ
            {
                return true;
            }
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);
            ValidateViewContext context;
            context.m_scopeName = m_scope->GetId().GetCStr();
            context.m_srgName = shaderResourceGroup.GetName().GetCStr();
@@ -9,7 +9,6 @@
 #include <Atom/RHI/Device.h>
 #include <Atom/RHI/MemoryStatisticsBus.h>

-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/std/sort.h>

 namespace AZ
@@ -112,7 +111,7 @@ namespace AZ

        ResultCode Device::BeginFrame()
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);

            if (ValidateIsInitialized() && ValidateIsNotInFrame())
            {
@@ -17,8 +17,6 @@
 #include <Atom/RHI/Scope.h>
 #include <Atom/RHI/SwapChain.h>
 #include <Atom/RHI/SwapChainFrameAttachment.h>
-#include <AzCore/Debug/EventTrace.h>
-#include <AzCore/std/sort.h>

 namespace AZ
 {
@@ -61,7 +59,7 @@ namespace AZ

        void FrameGraph::Begin()
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);

            AZ_Assert(m_isBuilding == false, "FrameGraph::Begin called, but End was never called on the previous build cycle!");
            AZ_Assert(m_isCompiled == false, "FrameGraph::Clear must be called before reuse.");
@@ -12,8 +12,6 @@
 #include <Atom/RHI/BufferScopeAttachment.h>
 #include <Atom/RHI/ImageScopeAttachment.h>
 #include <Atom/RHI/SwapChain.h>
-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace RHI
@@ -17,7 +17,6 @@
 #include <Atom/RHI/Scope.h>
 #include <Atom/RHI/SwapChainFrameAttachment.h>
 #include <Atom/RHI/TransientAttachmentPool.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/IO/SystemFile.h>
 #include <AzCore/std/sort.h>
 #include <AzCore/std/optional.h>
@@ -288,7 +287,7 @@ namespace AZ
                return;
            }

-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);

            /**
             * Each attachment declares which queue classes it can be used on. We require that the first scope be on the most
@@ -10,8 +10,6 @@
 #include <Atom/RHI/FrameGraphExecuter.h>
 #include <Atom/RHI/FrameGraph.h>
 #include <Atom/RHI/Image.h>
-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace RHI
@@ -11,7 +11,6 @@
 #include <Atom/RHI/FrameGraphAttachmentDatabase.h>
 #include <Atom/RHI/ImageScopeAttachment.h>
 #include <Atom/RHI/BufferScopeAttachment.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/IO/SystemFile.h>

 namespace AZ
@@ -24,7 +24,6 @@
 #include <Atom/RHI/ResourcePoolDatabase.h>
 #include <Atom/RHI/RayTracingShaderTable.h>

-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/Interface/Interface.h>
 #include <AzCore/Jobs/Algorithms.h>
 #include <AzCore/Jobs/JobCompletion.h>
@@ -8,8 +8,6 @@

 #include <Atom/RHI/ResourceView.h>
 #include <Atom/RHI/Resource.h>
-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace RHI
@@ -57,7 +55,7 @@ namespace AZ

        ResultCode ResourceView::OnResourceInvalidate()
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);
            ResultCode resultCode = InvalidateInternal();
            if (resultCode == ResultCode::Success)
            {
@@ -10,8 +10,6 @@
 #include <Atom/RHI/ImagePoolBase.h>
 #include <Atom/RHI/BufferPoolBase.h>

-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace RHI
@@ -90,7 +88,7 @@ namespace AZ

        void Scope::QueueResourcePoolResolves(ResourcePoolDatabase& resourcePoolDatabase)
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);

            const auto queuePoolResolverFunction = [this](ResourcePoolResolver* poolResolver)
            {
@@ -7,8 +7,6 @@
 */
 #include <Atom/RHI/ShaderResourceGroupInvalidateRegistry.h>
 #include <Atom/RHI/ShaderResourceGroup.h>
-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace RHI
@@ -60,7 +58,7 @@ namespace AZ

        ResultCode ShaderResourceGroupInvalidateRegistry::OnResourceInvalidate()
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);
            AZ_Assert(m_compileGroupFunction, "No compile function set");
            const Resource* resource = *ResourceInvalidateBus::GetCurrentBusId();

@@ -8,8 +8,6 @@
 #include <Atom/RHI/ShaderResourceGroupPool.h>
 #include <Atom/RHI/BufferView.h>
 #include <Atom/RHI/ImageView.h>
-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace RHI
@@ -250,7 +248,7 @@ namespace AZ

        void ShaderResourceGroupPool::CompileGroupsForInterval(Interval interval)
        {
-            AZ_TRACE_METHOD_NAME("CompileGroupsForInterval");
+            AZ_PROFILE_SCOPE(RHI, "CompileGroupsForInterval");

            AZ_Assert(m_isCompiling, "You must call CompileGroupsBegin() first!");
            AZ_Assert(
@@ -7,8 +7,6 @@
 */
 #include <Atom/RHI/StreamingImagePool.h>

-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace RHI
@@ -74,7 +72,7 @@ namespace AZ

        ResultCode StreamingImagePool::Init(Device& device, const StreamingImagePoolDescriptor& descriptor)
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);

            return ResourcePool::Init(
                device, descriptor,
@@ -93,7 +91,7 @@ namespace AZ

        ResultCode StreamingImagePool::InitImage(const StreamingImageInitRequest& initRequest)
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);

            if (!ValidateIsInitialized())
            {
@@ -8,8 +8,6 @@
 #include <Atom/RHI/SwapChain.h>
 #include <Atom/RHI/Factory.h>
 #include <Atom/RHI/MemoryStatisticsBuilder.h>
-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace RHI
@@ -185,7 +183,7 @@ namespace AZ

        void SwapChain::Present()
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);
            // Due to swapchain recreation, the images are refreshed.
            // There is no need to present swapchain for this frame.
            const uint32_t imageCount = aznumeric_cast<uint32_t>(m_images.size());
@@ -12,8 +12,6 @@
 #include <AzCore/Utils/Utils.h>
 #include <AzCore/Component/ComponentApplicationBus.h>
 #include <AzFramework/StringFunc/StringFunc.h>
-#include <AzCore/Debug/EventTrace.h>
-
 #if defined(USE_NSIGHT_AFTERMATH)
 GpuCrashTracker::~GpuCrashTracker()
 {
@@ -14,7 +14,6 @@
 #include <Atom/RHI.Reflect/TransientBufferDescriptor.h>
 #include <Atom/RHI.Reflect/TransientImageDescriptor.h>
 #include <Atom/RHI/MemoryStatisticsBuilder.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/std/sort.h>

 namespace AZ
@@ -10,7 +10,6 @@
 #include <RHI/Device.h>

 #include <AzCore/Casting/lossy_cast.h>
-#include <AzCore/Debug/EventTrace.h> 

 namespace AZ
 {
@@ -82,7 +81,7 @@ namespace AZ

        BufferMemoryView BufferMemoryAllocator::Allocate(size_t sizeInBytes, size_t overrideSubAllocAlignment)
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);
            
            BufferMemoryView bufferMemoryView;

@@ -141,7 +140,7 @@ namespace AZ

        BufferMemoryView BufferMemoryAllocator::AllocateUnique(const RHI::BufferDescriptor& bufferDescriptor)
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);

            const size_t alignedSize = RHI::AlignUp(bufferDescriptor.m_byteCount, Alignment::CommittedBuffer);

@@ -14,7 +14,6 @@
 #include <RHI/Device.h>
 #include <RHI/ResourcePoolResolver.h>
 #include <Atom/RHI.Reflect/DX12/BufferPoolDescriptor.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/Casting/lossy_cast.h>

 #include <algorithm>
@@ -54,7 +53,7 @@ namespace AZ

            CpuVirtualAddress MapBuffer(const RHI::BufferMapRequest& request)
            {
-                AZ_TRACE_METHOD();
+                AZ_PROFILE_FUNCTION(RHI);

                MemoryView stagingMemory = m_device->AcquireStagingMemory(request.m_byteCount, Alignment::Buffer);

@@ -247,7 +246,7 @@ namespace AZ

        RHI::ResultCode BufferPool::InitBufferInternal(RHI::Buffer& bufferBase, const RHI::BufferDescriptor& bufferDescriptor)
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);

            // We need respect the buffer's alignment if the buffer is used for SRV or UAV
            bool useBufferAlignment = RHI::CheckBitsAny(bufferDescriptor.m_bindFlags,
@@ -307,7 +306,7 @@ namespace AZ

        RHI::ResultCode BufferPool::MapBufferInternal(const RHI::BufferMapRequest& request, RHI::BufferMapResponse& response)
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);

            const RHI::BufferPoolDescriptor& poolDescriptor = GetDescriptor();
            Buffer& buffer = *static_cast<Buffer*>(request.m_buffer);
@@ -20,7 +20,6 @@
 #include <RHI/CommandQueue.h>
 #include <RHI/QueryPool.h>
 #include <Atom/RHI/IndirectArguments.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <RHI/RayTracingBlas.h>
 #include <RHI/RayTracingTlas.h>
 #include <RHI/RayTracingPipelineState.h>
@@ -563,7 +562,7 @@ namespace AZ
                return;
            }

-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);
            D3D12_VIEWPORT dx12Viewports[D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE];

            const auto& viewports = m_state.m_viewportState.m_states;
@@ -588,7 +587,7 @@ namespace AZ
                return;
            }

-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);
            D3D12_RECT dx12Scissors[D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE];

            const auto& scissors = m_state.m_scissorState.m_states;
@@ -9,8 +9,6 @@
 #include <RHI/CommandList.h>
 #include <RHI/Conversions.h>
 #include <RHI/DescriptorContext.h>
-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace DX12
@@ -28,7 +26,7 @@ namespace AZ

            RHI::Ptr<ID3D12CommandAllocator> CommandAllocatorFactory::CreateObject()
            {
-                AZ_TRACE_METHOD();
+                AZ_PROFILE_FUNCTION(RHI);
                Microsoft::WRL::ComPtr<ID3D12CommandAllocator> allocator;
                AssertSuccess(m_descriptor.m_dx12Device->CreateCommandAllocator(
                    ConvertHardwareQueueClass(m_descriptor.m_hardwareQueueClass),
@@ -39,7 +37,7 @@ namespace AZ

            void CommandAllocatorFactory::ResetObject(ID3D12CommandAllocator& allocator)
            {
-                AZ_TRACE_METHOD();
+                AZ_PROFILE_FUNCTION(RHI);
                allocator.Reset();
            }

@@ -14,7 +14,6 @@
 #include <RHI/Fence.h>
 #include <Atom/RHI/MemoryStatisticsBuilder.h>
 #include <Atom/RHI.Reflect/DX12/PlatformLimitsDescriptor.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/std/parallel/lock.h>
 #include <AzCore/std/string/conversions.h>
 #include <AzCore/std/smart_ptr/make_shared.h>
@@ -191,7 +190,7 @@ namespace AZ

        void Device::EndFrameInternal()
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);
            m_commandQueueContext.End();

            m_commandListAllocator.Collect();
@@ -359,7 +358,7 @@ namespace AZ
            D3D12_RESOURCE_STATES initialState,
            D3D12_HEAP_TYPE heapType)
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);

            D3D12_RESOURCE_DESC resourceDesc;
            ConvertImageDescriptor(imageDescriptor, resourceDesc);
@@ -19,8 +19,6 @@
 #include <Atom/RHI/ImageScopeAttachment.h>
 #include <Atom/RHI/ScopeAttachment.h>
 #include <Atom/RHI/SwapChainFrameAttachment.h>
-#include <AzCore/Debug/EventTrace.h>
-
 // #define AZ_DX12_FRAMESCHEDULER_LOG_TRANSITIONS

 namespace AZ
@@ -695,7 +693,7 @@ namespace AZ
        {
            Device& device = static_cast<Device&>(GetDevice());

-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);
            CommandQueueContext& context = device.GetCommandQueueContext();

            for (RHI::Scope* scopeBase : frameGraph.GetScopes())
@@ -12,8 +12,6 @@
 #include <RHI/CommandQueueContext.h>
 #include <Atom/RHI/FrameGraph.h>
 #include <Atom/RHI.Reflect/DX12/PlatformLimitsDescriptor.h>
-#include <AzCore/Debug/EventTrace.h>
-

 namespace AZ
 {
@@ -11,8 +11,6 @@
 #include <RHI/Image.h>
 #include <RHI/ResourcePoolResolver.h>
 #include <Atom/RHI/MemoryStatisticsBuilder.h>
-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace DX12
@@ -33,7 +31,7 @@ namespace AZ

            RHI::ResultCode UpdateImage(const RHI::ImageUpdateRequest& request, size_t& bytesTransferred)
            {
-                AZ_TRACE_METHOD();
+                AZ_PROFILE_FUNCTION(RHI);

                AZStd::lock_guard<AZStd::mutex> lock(m_imagePacketMutex);

@@ -7,8 +7,6 @@
 */
 #include <RHI/Conversions.h>
 #include <RHI/Device.h>
-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace DX12
@@ -35,7 +33,7 @@ namespace AZ
                return nullptr;
            }

-            AZ_TRACE_METHOD_NAME("Create Buffer Page");
+            AZ_PROFILE_SCOPE(RHI, "Create Buffer Page");

            D3D12_RESOURCE_STATES initialResourceState = ConvertInitialResourceState(m_descriptor.m_heapMemoryLevel, m_descriptor.m_hostMemoryAccess);
            if (RHI::CheckBitsAny(m_descriptor.m_bindFlags, RHI::BufferBindFlags::RayTracingAccelerationStructure))
@@ -8,7 +8,6 @@
 #include <RHI/MemoryView.h>

 #include <AzCore/Casting/numeric_cast.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/std/string/string.h>
 #include <AzCore/std/string/conversions.h>

@@ -55,7 +54,7 @@ namespace AZ

        CpuVirtualAddress MemoryView::Map(RHI::HostMemoryAccess hostAccess) const
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);

            CpuVirtualAddress cpuAddress = nullptr;
            D3D12_RANGE readRange = {};
@@ -10,8 +10,6 @@
 #include <Atom/RHI.Reflect/DX12/ShaderStageFunction.h>
 #include <RHI/Conversions.h>
 #include <RHI/Device.h>
-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace DX12
@@ -5,7 +5,6 @@
 * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 */
-#include <AzCore/Debug/EventTrace.h>
 #include <RHI/RayTracingBlas.h>
 #include <RHI/Buffer.h>
 #include <RHI/Conversions.h>
@@ -10,8 +10,6 @@
 #include <Atom/RHI.Reflect/DX12/ShaderStageFunction.h>
 #include <RHI/Conversions.h>
 #include <RHI/Device.h>
-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace DX12
@@ -12,7 +12,6 @@
 #include <RHI/Conversions.h>
 #include <RHI/Device.h>
 #include <Atom/RHI/Factory.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <Atom/RHI/BufferPool.h>
 #include <Atom/RHI/RayTracingBufferPools.h>
 #include <RHI/ShaderResourceGroup.h>
@@ -5,7 +5,6 @@
 * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 */
-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/Math/Matrix3x4.h>
 #include <RHI/RayTracingTlas.h>
 #include <RHI/RayTracingBlas.h>
@@ -20,8 +20,6 @@
 #include <Atom/RHI/BufferScopeAttachment.h>
 #include <Atom/RHI/Factory.h>
 #include <Atom/RHI/ResolveScopeAttachment.h>
-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace DX12
@@ -305,7 +303,7 @@ namespace AZ
            uint32_t commandListCount) const
        {
            AZ_UNUSED(commandListCount);
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);

            commandList.GetValidator().BeginScope(*this);

@@ -387,7 +385,7 @@ namespace AZ
            uint32_t commandListIndex,
            uint32_t commandListCount) const
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);

            const bool isEpilogue = (commandListIndex + 1) == commandListCount;
            if (isEpilogue)
@@ -14,8 +14,6 @@
 #include <RHI/Device.h>
 #include <RHI/Image.h>
 #include <RHI/ImageView.h>
-#include <AzCore/Debug/EventTrace.h>
-

 namespace AZ
 {
@@ -9,8 +9,6 @@
 #include <RHI/Device.h>
 #include <Atom/RHI/MemoryStatisticsBuilder.h>

-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace DX12
@@ -124,7 +122,7 @@ namespace AZ

        MemoryView StagingMemoryAllocator::AllocateUnique(size_t sizeInBytes)
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);
            RHI::BufferDescriptor descriptor;
            descriptor.m_byteCount = sizeInBytes;
            MemoryView memoryView = m_device->CreateBufferCommitted(descriptor, D3D12_RESOURCE_STATE_GENERIC_READ, D3D12_HEAP_TYPE_UPLOAD);
@@ -12,8 +12,6 @@
 #include <RHI/Image.h>
 #include <RHI/ResourcePoolResolver.h>
 #include <Atom/RHI/MemoryStatisticsBuilder.h>
-#include <AzCore/Debug/EventTrace.h>
-
 // NOTE: Tiled resources are currently disabled, because RenderDoc does not support them.
 // #define AZ_RHI_USE_TILED_RESOURCES

@@ -121,7 +119,7 @@ namespace AZ

        D3D12_RESOURCE_ALLOCATION_INFO StreamingImagePool::GetAllocationInfo(const RHI::ImageDescriptor& imageDescriptor, uint32_t residentMipLevel)
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);

            uint32_t alignment = GetFormatDimensionAlignment(imageDescriptor.m_format);

@@ -138,9 +136,7 @@ namespace AZ

        RHI::ResultCode StreamingImagePool::InitInternal([[maybe_unused]] RHI::Device& deviceBase, [[maybe_unused]] const RHI::StreamingImagePoolDescriptor& descriptor)
        {
-            AZ_TRACE_METHOD();
-
-
+            AZ_PROFILE_FUNCTION(RHI);

 #ifdef AZ_RHI_USE_TILED_RESOURCES
            {
@@ -232,7 +228,7 @@ namespace AZ

        void StreamingImagePool::AllocatePackedImageTiles(Image& image)
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);

            AZ_Assert(image.IsTiled(), "This method is only valid for tiled resources.");
            AZ_Assert(image.GetDescriptor().m_arraySize == 1, "Not implemented for image arrays.");
@@ -305,7 +301,7 @@ namespace AZ

        RHI::ResultCode StreamingImagePool::InitImageInternal(const RHI::StreamingImageInitRequest& request)
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);

            Image& image = static_cast<Image&>(*request.m_image);

@@ -38,7 +38,6 @@
 #include <RHI/TransientAttachmentPool.h>
 #include <Atom/RHI.Reflect/DX12/Base.h>
 #include <Atom/RHI/FactoryManagerBus.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/Serialization/SerializeContext.h>

 namespace AZ
@@ -8,7 +8,6 @@
 #include <Atom/RHI/MemoryStatisticsBuilder.h>
 #include <Atom/RHI.Reflect/TransientImageDescriptor.h>
 #include <Atom/RHI.Reflect/TransientBufferDescriptor.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <RHI/AliasedHeap.h>
 #include <RHI/AliasingBarrierTracker.h>
 #include <RHI/Buffer.h>
@@ -11,7 +11,6 @@
 #include <Atom/RHI/BufferPool.h>
 #include <Atom/RHI/CommandQueue.h>
 #include <AzCore/Component/TickBus.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <RHI/AsyncUploadQueue.h>
 #include <RHI/Buffer.h>
 #include <RHI/Device.h>
@@ -120,21 +119,21 @@ namespace AZ

            m_copyQueue->QueueCommand([=](void* queue)
            {
-                AZ_TRACE_METHOD_NAME("Upload Buffer");
+                AZ_PROFILE_SCOPE(RHI, "Upload Buffer");
                size_t pendingByteOffset = 0;
                size_t pendingByteCount = byteCount;
                CommandQueue* commandQueue = static_cast<CommandQueue*>(queue);
                
                while (pendingByteCount > 0)
                {
-                    AZ_TRACE_METHOD_NAME("Upload Buffer Chunk");
+                    AZ_PROFILE_SCOPE(RHI, "Upload Buffer Chunk");

                    FramePacket* framePacket = BeginFramePacket(commandQueue);

                    const size_t bytesToCopy = AZStd::min(pendingByteCount, m_descriptor.m_stagingSizeInBytes);

                    {
-                        AZ_TRACE_METHOD_NAME("Copy CPU buffer");
+                        AZ_PROFILE_SCOPE(RHI, "Copy CPU buffer");
                        memcpy(framePacket->m_stagingResourceData, sourceData + pendingByteOffset, bytesToCopy);
                        Platform::SynchronizeBufferOnCPU(framePacket->m_stagingResource, 0, bytesToCopy);
                    }
@@ -379,7 +378,7 @@ namespace AZ
        {
            AZ_Assert(!m_recordingFrame, "The previous frame packet isn't ended");

-            AZ_TRACE_METHOD_NAME("AsyncUploadQueue: Wait copy frame");
+            AZ_PROFILE_SCOPE(RHI, "AsyncUploadQueue: Wait copy frame");
            FramePacket& framePacket = m_framePackets[m_frameIndex];
            framePacket.m_fence.WaitOnCpu(); // ensure any previous uploads using this frame have completed
                        
@@ -400,7 +399,7 @@ namespace AZ
            {
                AZ_Assert(m_recordingFrame, "The frame packet wasn't started. You need to call StartFramePacket first.");

-                AZ_TRACE_METHOD_NAME("AsyncUploadQueue: Execute command");
+                AZ_PROFILE_SCOPE(RHI, "AsyncUploadQueue: Execute command");
                FramePacket& framePacket = m_framePackets[m_frameIndex];
                framePacket.m_fence.SignalFromGpu(framePacket.m_mtlCommandBuffer); // signal fence when this upload haas completed

@@ -116,7 +116,7 @@ namespace AZ

        BufferMemoryView BufferMemoryAllocator::AllocateUnique(const RHI::BufferDescriptor& bufferDescriptor)
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);
            const size_t alignedSize = RHI::AlignUp(bufferDescriptor.m_byteCount, Alignment::Buffer);
            
            RHI::HeapMemoryUsage& heapMemoryUsage = *m_descriptor.m_getHeapMemoryUsageFunction();
@@ -7,7 +7,6 @@
 */

 #include <Atom/RHI.Reflect/Bits.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/std/algorithm.h>
 #include <RHI/ArgumentBuffer.h>
 #include <RHI/Buffer.h>
@@ -177,7 +176,7 @@ namespace AZ
        
        void CommandList::Submit(const RHI::DispatchItem& dispatchItem)
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);
            
            CreateEncoder(CommandEncoderType::Compute);
            bool bindResourceSuccessfull = CommitShaderResources<RHI::PipelineStateType::Dispatch>(dispatchItem);
@@ -479,7 +478,7 @@ namespace AZ
        
        void CommandList::Submit(const RHI::DrawItem& drawItem)
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);
            
            CreateEncoder(CommandEncoderType::Render);
            
@@ -582,7 +581,7 @@ namespace AZ
        {
            if (m_state.m_pipelineState != pipelineState)
            {
-                AZ_TRACE_METHOD();
+                AZ_PROFILE_FUNCTION(RHI);
                m_state.m_pipelineState = pipelineState;

                switch (pipelineState->GetType())
@@ -732,7 +731,7 @@ namespace AZ
                return;
            }
            
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);
            const auto& viewports = m_state.m_viewportState.m_states;
            MTLViewport metalViewports[viewports.size()];

@@ -7,7 +7,6 @@
 */

 #include <Atom/RHI.Reflect/AttachmentEnums.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <RHI/CommandListBase.h>
 #include <Source/RHI/Device.h>

@@ -7,7 +7,6 @@
 */

 #include <Atom/RHI.Reflect/Base.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <RHI/CommandQueue.h>

 namespace AZ
@@ -6,7 +6,6 @@
 *
 */

-#include <AzCore/Debug/EventTrace.h>
 #include <Atom/RHI/CommandQueue.h>
 #include <RHI/Device.h>
 #include <RHI/CommandQueue.h>
@@ -60,7 +59,7 @@ namespace AZ

        void CommandQueueContext::WaitForIdle()
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);
            for (uint32_t hardwareQueueIdx = 0; hardwareQueueIdx < RHI::HardwareQueueClassCount; ++hardwareQueueIdx)
            {
                m_commandQueues[hardwareQueueIdx]->WaitForIdle();
@@ -8,7 +8,6 @@
 #include <Atom/RHI/Factory.h>
 #include <Atom/RHI/RHISystemInterface.h>
 #include <Atom/RHI.Reflect/Metal/PlatformLimitsDescriptor.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <AzFramework/API/ApplicationAPI.h>
 #include <AzFramework/Components/TransformComponent.h>
 #include <AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.h>
@@ -7,7 +7,6 @@
 */

 #include <Atom/RHI/FrameGraph.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <RHI/Device.h>
 #include <RHI/FrameGraphCompiler.h>
 #include <RHI/Scope.h>
@@ -47,7 +46,7 @@ namespace AZ
        {
            Device& device = static_cast<Device&>(GetDevice());

-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);
            CommandQueueContext& context = device.GetCommandQueueContext();

            for (RHI::Scope* scopeBase : frameGraph.GetScopes())
@@ -7,7 +7,6 @@
 */

 #include <Atom/RHI/FrameGraph.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <RHI/Device.h>
 #include <RHI/FrameGraphExecuter.h>
 #include <RHI/FrameGraphExecuteGroupMerged.h>
@@ -9,8 +9,6 @@
 #include <RHI/Conversions.h>
 #include <RHI/Device.h>
 #include <RHI/MemoryPageAllocator.h>
-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace Metal
@@ -29,7 +27,7 @@ namespace AZ
                return nullptr;
            }

-            AZ_TRACE_METHOD_NAME("Create Buffer Page");
+            AZ_PROFILE_SCOPE(RHI, "Create Buffer Page");

            RHI::BufferDescriptor bufferDescriptor;
            bufferDescriptor.m_byteCount = m_descriptor.m_pageSizeInBytes;
@@ -10,7 +10,6 @@
 #include <Atom/RHI.Reflect/Metal/PipelineLayoutDescriptor.h>
 #include <Atom/RHI.Reflect/Metal/ShaderStageFunction.h>
 #include <Atom/RHI.Reflect/ShaderStageFunction.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <RHI/Conversions.h>
 #include <RHI/Device.h>
 #include <RHI/PipelineState.h>
@@ -8,7 +8,6 @@

 #include <Atom/RHI/ImageScopeAttachment.h>
 #include <Atom/RHI/ResolveScopeAttachment.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <RHI/CommandList.h>
 #include <RHI/Conversions.h>
 #include <RHI/Device.h>
@@ -273,7 +272,7 @@ namespace AZ
            AZ::u32 commandListIndex,
            AZ::u32 commandListCount) const
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);

            if(m_isWritingToSwapChainScope)
            {
@@ -331,7 +330,7 @@ namespace AZ
            AZ::u32 commandListIndex,
            AZ::u32 commandListCount) const
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);
            const bool isEpilogue = (commandListIndex + 1) == commandListCount;
            
            commandList.FlushEncoder();
@@ -6,7 +6,6 @@
 *
 */

-#include <AzCore/Debug/EventTrace.h>
 #include <RHI/ArgumentBuffer.h>
 #include <RHI/Conversions.h>
 #include <RHI/Device.h>
@@ -8,7 +8,6 @@

 #include <Atom/RHI/MemoryStatisticsBuilder.h>
 #include <AzCore/Casting/lossy_cast.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <RHI/CommandList.h>
 #include <RHI/Conversions.h>
 #include <RHI/Device.h>
@@ -36,7 +35,7 @@ namespace AZ
        
        RHI::ResultCode StreamingImagePool::InitInternal(RHI::Device& deviceBase, const RHI::StreamingImagePoolDescriptor& descriptor)
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);
            
            Device& device = static_cast<Device&>(deviceBase);
            SetResolver(AZStd::make_unique<StreamingImagePoolResolver>(device, this));
@@ -89,7 +88,7 @@ namespace AZ
        
        RHI::ResultCode StreamingImagePool::ExpandImageInternal(const RHI::StreamingImageExpandRequest& request)
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);
            auto& image = static_cast<Image&>(*request.m_image);
            auto& device = static_cast<Device&>(GetDevice());

@@ -6,7 +6,6 @@
 *
 */

-#include <AzCore/Debug/EventTrace.h>
 #include <RHI/StreamingImagePool.h>
 #include <RHI/StreamingImagePoolResolver.h>

@@ -16,7 +15,7 @@ namespace AZ
    {
        RHI::ResultCode StreamingImagePoolResolver::UpdateImage(const RHI::StreamingImageExpandRequest& request)
        {
-            AZ_TRACE_METHOD();
+            AZ_PROFILE_FUNCTION(RHI);
            
            Image* image = static_cast<Image*>(request.m_image);
            const RHI::ImageDescriptor& imageDescriptor = image->GetDescriptor();
@@ -16,7 +16,6 @@
 #include <Atom/RHI/RayTracingPipelineState.h>
 #include <Atom/RHI/RayTracingShaderTable.h>
 #include <Atom/RHI.Reflect/Metal/Base.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <RHI/BufferPool.h>
 #include <RHI/BufferView.h>
@@ -12,7 +12,6 @@
 #include <Atom/RHI/PhysicalDevice.h>
 #include <Atom/RHI/QueryPool.h>
 #include <Atom/RHI.Reflect/Null/Base.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <RHI/BufferPool.h>
 #include <RHI/BufferView.h>
@@ -16,8 +16,6 @@
 #include <RHI/PhysicalDevice.h>
 #include <Atom/RHI.Reflect/TransientBufferDescriptor.h>
 #include <Atom/RHI.Reflect/TransientImageDescriptor.h>
-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace Vulkan
@@ -8,8 +8,6 @@
 #include <RHI/BufferMemoryPageAllocator.h>
 #include <RHI/Device.h>
 #include <RHI/Conversion.h>
-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace Vulkan
@@ -50,7 +48,7 @@ namespace AZ
                return nullptr;
            }

-            AZ_TRACE_METHOD_NAME("Create BufferMemory Page");
+            AZ_PROFILE_SCOPE(RHI, "Create BufferMemory Page");

            RHI::Ptr<BufferMemory> bufferMemory;

@@ -7,7 +7,6 @@
 */
 #include <AzCore/std/algorithm.h>
 #include <AzCore/std/sort.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <RHI/CommandQueueContext.h>
 #include <RHI/Device.h>
 #include <RHI/Semaphore.h>
@@ -13,7 +13,6 @@
 #include <Atom/RHI/FrameGraph.h>
 #include <Atom/RHI/ImageScopeAttachment.h>
 #include <Atom/RHI/SwapChainFrameAttachment.h>
-#include <AzCore/Debug/EventTrace.h>
 #include <RHI/Buffer.h>
 #include <RHI/BufferView.h>
 #include <RHI/Conversion.h>
@@ -8,8 +8,6 @@
 #include <RHI/MemoryPageAllocator.h>
 #include <RHI/Device.h>
 #include <RHI/Conversion.h>
-#include <AzCore/Debug/EventTrace.h>
-
 namespace AZ
 {
    namespace Vulkan
@@ -35,7 +33,7 @@ namespace AZ
                return nullptr;
            }

-            AZ_TRACE_METHOD_NAME("Create Memory Page");
+            AZ_PROFILE_SCOPE(RHI, "Create Memory Page");

            const VkMemoryPropertyFlags flags = ConvertHeapMemoryLevel(m_descriptor.m_heapMemoryLevel) | m_descriptor.m_additionalMemoryPropertyFlags;
            RHI::Ptr<Memory> memory = GetDevice().AllocateMemory(sizeInBytes, m_descriptor.m_memoryTypeBits, flags);
--- a/Show More
+++ b/Show More