IVGCVSW-6470 Create MemoryStrategyBenchmark

 * Refactor the strategy library to be more generic
 * Shorten the names of the current strategies
 * Change validatorStrat to throw exceptions

Change-Id: I0d9c9ef609b2d8675e5788610d1accac6767c660
Signed-off-by: Finn Williams <finwil01@e127804.cambridge.arm.com>
Signed-off-by: Jim Flynn <jim.flynn@arm.com>

2 files changed, 5 insertions, 5 deletions

diff --git a/src/backends/backendsCommon/test/BackendRegistryTests.cpp b/src/backends/backendsCommon/test/BackendRegistryTests.cpp
index 5acc61fe2c..18b3745a2e 100644
--- a/src/backends/backendsCommon/test/BackendRegistryTests.cpp
+++ b/src/backends/backendsCommon/test/BackendRegistryTests.cpp
@@ -7,7 +7,7 @@
 #include <armnn/BackendRegistry.hpp>
 
 #include <armnn/backends/IBackendInternal.hpp>
-#include <backendsCommon/memoryOptimizationStrategies/ConstLayerMemoryOptimizerStrategy.hpp>
+#include <backendsCommon/memoryOptimizerStrategyLibrary/strategies/ConstantMemoryStrategy.hpp>
 #include <reference/RefBackend.hpp>
 
 #include <doctest/doctest.h>
@@ -156,7 +156,7 @@ TEST_CASE("RegisterMemoryOptimizerStrategy")
 
     // Register the memory optimizer
     std::shared_ptr<IMemoryOptimizerStrategy> memoryOptimizerStrategy =
-        std::make_shared<ConstLayerMemoryOptimizerStrategy>();
+        std::make_shared<ConstantMemoryStrategy>();
     BackendRegistryInstance().RegisterMemoryOptimizerStrategy(cpuRefBackendId, memoryOptimizerStrategy);
     CHECK(!BackendRegistryInstance().GetMemoryOptimizerStrategies().empty());
     CHECK(BackendRegistryInstance().GetMemoryOptimizerStrategies().size() == 1);
diff --git a/src/backends/backendsCommon/test/CustomMemoryOptimizerStrategyTests.cpp b/src/backends/backendsCommon/test/CustomMemoryOptimizerStrategyTests.cpp
index a5bf17c8b1..11eae04775 100644
--- a/src/backends/backendsCommon/test/CustomMemoryOptimizerStrategyTests.cpp
+++ b/src/backends/backendsCommon/test/CustomMemoryOptimizerStrategyTests.cpp
@@ -80,18 +80,18 @@ TEST_CASE("CpuRefSetMemoryOptimizerStrategyTest")
     options.m_BackendOptions.emplace_back(
          BackendOptions{"CpuRef",
          {
-             {"MemoryOptimizerStrategy", "ConstLayerMemoryOptimizerStrategy"}
+             {"MemoryOptimizerStrategy", "ConstantMemoryStrategy"}
          }
     });
 
     IRuntimePtr run = IRuntime::Create(options);
 
-    // ConstLayerMemoryOptimizerStrategy should be registered for CpuRef
+    // ConstantMemoryStrategy should be registered for CpuRef
     CHECK(!BackendRegistryInstance().GetMemoryOptimizerStrategies().empty());
     CHECK(BackendRegistryInstance().GetMemoryOptimizerStrategies().size() == 1);
     CHECK(BackendRegistryInstance().GetMemoryOptimizerStrategies().at(RefBackend::GetIdStatic()));
     auto optimizerStrategy = BackendRegistryInstance().GetMemoryOptimizerStrategies().at(RefBackend::GetIdStatic());
-    CHECK(optimizerStrategy->GetName() == std::string("ConstLayerMemoryOptimizerStrategy"));
+    CHECK(optimizerStrategy->GetName() == std::string("ConstantMemoryStrategy"));
     armnn::BackendRegistryInstance().DeregisterMemoryOptimizerStrategy(RefBackend::GetIdStatic());
 }