IVGCVSW-7423 Add ArmnnDelegatePlugin

Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Signed-off-by: Ryan OShea <ryan.oshea3@arm.com>
Change-Id: Ie02021ac56a512598760e4c6d05ef1a80f4aec8d

2 files changed, 34 insertions, 3 deletions

diff --git a/delegate/opaque/src/armnn_delegate.cpp b/delegate/opaque/src/armnn_delegate.cpp
index fa64679efc..8cdf01ffc3 100644
--- a/delegate/opaque/src/armnn_delegate.cpp
+++ b/delegate/opaque/src/armnn_delegate.cpp
@@ -62,11 +62,15 @@ namespace armnnOpaqueDelegate
 const TfLiteStableDelegate TFL_TheStableDelegate =
 {
     /*delegate_abi_version=*/ TFL_STABLE_DELEGATE_ABI_VERSION,
-    /*delegate_name=*/        "ArmnnDelegatePlugin",
-    /*delegate_version=*/     "1.0.0",
+    /*delegate_name=*/        "armnn_delegate",
+    /*delegate_version=*/     OPAQUE_DELEGATE_VERSION,
     /*delegate_plugin=*/      GetArmnnDelegatePluginApi()
 };
 
+static auto* g_delegate_plugin_ArmnnDelegatePlugin_ =
+    new tflite::delegates::DelegatePluginRegistry::Register(TFL_TheStableDelegate.delegate_name,
+                                                            ArmnnDelegatePlugin::New);
+
 ArmnnOpaqueDelegate::ArmnnOpaqueDelegate(armnnDelegate::DelegateOptions options)
     : m_Options(std::move(options))
 {
@@ -121,7 +125,9 @@ TfLiteStatus DoPrepare(TfLiteOpaqueContext* tfLiteContext, TfLiteOpaqueDelegate*
 
     // ArmNN Opaque Delegate Registration
     TfLiteRegistrationExternal* kernelRegistration =
-            TfLiteRegistrationExternalCreate(kTfLiteBuiltinDelegate, "TfLiteArmNNOpaqueDelegate", /*version=*/1);
+            TfLiteRegistrationExternalCreate(kTfLiteBuiltinDelegate,
+                                             TFL_TheStableDelegate.delegate_name,
+                                             /*version=*/OPAQUE_DELEGATE_MAJOR_VERSION);
     if(kernelRegistration == nullptr)
     {
         return kTfLiteError;
diff --git a/delegate/opaque/src/test/ArmnnOpaqueDelegateTest.cpp b/delegate/opaque/src/test/ArmnnOpaqueDelegateTest.cpp
index 1635b65809..79f98a9e5e 100644
--- a/delegate/opaque/src/test/ArmnnOpaqueDelegateTest.cpp
+++ b/delegate/opaque/src/test/ArmnnOpaqueDelegateTest.cpp
@@ -9,6 +9,9 @@
 #include <opaque/include/armnn_delegate.hpp>
 #include <opaque/include/Version.hpp>
 
+#include <flatbuffers/flatbuffers.h>
+#include <tensorflow/lite/experimental/acceleration/configuration/delegate_registry.h>
+
 namespace armnnOpaqueDelegate
 {
 
@@ -37,6 +40,28 @@ TEST_CASE ("DelegateOptions_OpaqueDelegateDefault")
     armnnOpaqueDelegate::TfLiteArmnnOpaqueDelegateDelete(opaqueDelegate);
 }
 
+TEST_CASE ("DelegatePluginTest")
+{
+    // Use default settings until options have been enabled.
+    flatbuffers::FlatBufferBuilder flatBufferBuilder;
+    tflite::TFLiteSettingsBuilder tfliteSettingBuilder(flatBufferBuilder);
+    flatbuffers::Offset<tflite::TFLiteSettings> tfliteSettings = tfliteSettingBuilder.Finish();
+    flatBufferBuilder.Finish(tfliteSettings);
+    const tflite::TFLiteSettings* settings = flatbuffers::GetRoot<tflite::TFLiteSettings>(
+        flatBufferBuilder.GetBufferPointer());
+
+    std::unique_ptr<tflite::delegates::DelegatePluginInterface> delegatePlugin =
+        tflite::delegates::DelegatePluginRegistry::CreateByName("armnn_delegate", *settings);
+
+    // Plugin is created correctly using armnn_delegate name.
+    CHECK((delegatePlugin != nullptr));
+
+    tflite::delegates::TfLiteDelegatePtr armnnDelegate = delegatePlugin->Create();
+
+    // Armnn Opaque Delegate is created correctly.
+    CHECK((armnnDelegate != nullptr));
+    CHECK((armnnDelegate->opaque_delegate_builder != nullptr));
 }
 
+}
 } // namespace armnnDelegate