From 6f073727ad98d94f43a3938ddeac3f5a231ad959 Mon Sep 17 00:00:00 2001 From: Cathal Corbett Date: Fri, 4 Mar 2022 12:11:09 +0000 Subject: IVGCVSW-6814 Remove references to armnn:BackendId in the profiling code Signed-off-by: Cathal Corbett Change-Id: Ib399a5eee9e52882800ec3e02e4173424a7c19b1 --- src/backends/backendsCommon/test/BackendProfilingTests.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/backends/backendsCommon/test/BackendProfilingTests.cpp') diff --git a/src/backends/backendsCommon/test/BackendProfilingTests.cpp b/src/backends/backendsCommon/test/BackendProfilingTests.cpp index 3651696fd3..d262abca1b 100644 --- a/src/backends/backendsCommon/test/BackendProfilingTests.cpp +++ b/src/backends/backendsCommon/test/BackendProfilingTests.cpp @@ -155,8 +155,8 @@ TEST_CASE("TestBackendCounters") CounterIdMap counterIdMap; MockBackendSendCounterPacket sendCounterPacket; - const armnn::BackendId cpuAccId(armnn::Compute::CpuAcc); - const armnn::BackendId gpuAccId(armnn::Compute::GpuAcc); + const std::string cpuAccId(GetComputeDeviceAsCString(armnn::Compute::CpuAcc)); + const std::string gpuAccId(GetComputeDeviceAsCString(armnn::Compute::GpuAcc)); ProfilingOptions options; options.m_EnableProfiling = true; @@ -173,7 +173,7 @@ TEST_CASE("TestBackendCounters") std::shared_ptr gpuProfilingContextPtr = std::make_shared(gpuBackendProfilingPtr); - std::unordered_map> backendProfilingContexts; backendProfilingContexts[cpuAccId] = cpuProfilingContextPtr; @@ -222,7 +222,7 @@ TEST_CASE("TestBackendCounters") periodicCounterSelectionCommandHandler(PacketWriter(period, gpuCounters)); periodicCounterCapture.Stop(); - std::set activeIds = holder.GetCaptureData().GetActiveBackends(); + std::set activeIds = holder.GetCaptureData().GetActiveBackends(); CHECK(activeIds.size() == 1); CHECK((activeIds.find(gpuAccId) != activeIds.end())); @@ -403,8 +403,8 @@ TEST_CASE("TestBackendCounterLogging") CounterIdMap counterIdMap; MockBackendSendCounterPacket sendCounterPacket; - const armnn::BackendId cpuAccId(armnn::Compute::CpuAcc); - const armnn::BackendId gpuAccId(armnn::Compute::GpuAcc); + const std::string cpuAccId(GetComputeDeviceAsCString(armnn::Compute::CpuAcc)); + const std::string gpuAccId(GetComputeDeviceAsCString(armnn::Compute::GpuAcc)); ProfilingOptions options; options.m_EnableProfiling = true; @@ -417,7 +417,7 @@ TEST_CASE("TestBackendCounterLogging") std::shared_ptr cpuProfilingContextPtr = std::make_shared(cpuBackendProfilingPtr); - std::unordered_map> backendProfilingContexts; uint16_t globalId = 5; -- cgit v1.2.1