From c95988a0474acb13fc57b97dbf05ac7c1af5a453 Mon Sep 17 00:00:00 2001
From: Michalis Spyrou <michalis.spyrou@arm.com>
Date: Wed, 17 Jul 2019 13:24:52 +0100
Subject: COMPMID-2336: Change GPUTarget regex

Take into account non release naming.

Change-Id: I852efd0ee109f8880b73c7c8c1b1ce7fd53077b6
Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1564
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
---
 src/core/GPUTarget.cpp | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/core/GPUTarget.cpp b/src/core/GPUTarget.cpp
index c1ba4dfa39..c50e7a1a44 100644
--- a/src/core/GPUTarget.cpp
+++ b/src/core/GPUTarget.cpp
@@ -31,15 +31,15 @@ namespace
 {
 arm_compute::GPUTarget get_valhall_target(const std::string &version)
 {
-    if(version == "G77")
+    if(version.find("G77") != std::string::npos)
     {
         return arm_compute::GPUTarget::G77;
     }
-    else if(version == "TBOX")
+    else if(version.find("TBOX") != std::string::npos)
     {
         return arm_compute::GPUTarget::TBOX;
     }
-    else if(version == "TODX")
+    else if(version.find("TODX") != std::string::npos)
     {
         return arm_compute::GPUTarget::TODX;
     }
@@ -51,35 +51,35 @@ arm_compute::GPUTarget get_valhall_target(const std::string &version)
 
 arm_compute::GPUTarget get_bifrost_target(const std::string &version)
 {
-    if(version == "G71")
+    if(version.find("G71") != std::string::npos)
     {
         return arm_compute::GPUTarget::G71;
     }
-    else if(version == "G72")
+    else if(version.find("G72") != std::string::npos)
     {
         return arm_compute::GPUTarget::G72;
     }
-    else if(version == "G51")
-    {
-        return arm_compute::GPUTarget::G51;
-    }
-    else if(version == "G51BIG")
+    else if(version.find("G51BIG") != std::string::npos)
     {
         return arm_compute::GPUTarget::G51BIG;
     }
-    else if(version == "G51LIT")
+    else if(version.find("G51LIT") != std::string::npos)
     {
         return arm_compute::GPUTarget::G51LIT;
     }
-    else if(version == "G52")
+    else if(version.find("G51") != std::string::npos)
     {
-        return arm_compute::GPUTarget::G52;
+        return arm_compute::GPUTarget::G51;
     }
-    else if(version == "G52LIT")
+    else if(version.find("G52LIT") != std::string::npos)
     {
         return arm_compute::GPUTarget::G52LIT;
     }
-    else if(version == "G76")
+    else if(version.find("G52") != std::string::npos)
+    {
+        return arm_compute::GPUTarget::G52;
+    }
+    else if(version.find("G76") != std::string::npos)
     {
         return arm_compute::GPUTarget::G76;
     }
@@ -91,15 +91,15 @@ arm_compute::GPUTarget get_bifrost_target(const std::string &version)
 
 arm_compute::GPUTarget get_midgard_target(const std::string &version)
 {
-    if(version == "T600")
+    if(version.find("T600") != std::string::npos)
     {
         return arm_compute::GPUTarget::T600;
     }
-    else if(version == "T700")
+    else if(version.find("T700") != std::string::npos)
     {
         return arm_compute::GPUTarget::T700;
     }
-    else if(version == "T800")
+    else if(version.find("T800") != std::string::npos)
     {
         return arm_compute::GPUTarget::T800;
     }
-- 
cgit v1.2.1