diff options
| -rw-r--r-- | src/core/GPUTarget.cpp | 36 | ||||
| -rw-r--r-- | tests/validation/UNIT/GPUTarget.cpp | 1 |
2 files changed, 19 insertions, 18 deletions
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; } diff --git a/tests/validation/UNIT/GPUTarget.cpp b/tests/validation/UNIT/GPUTarget.cpp index 47166bf9d8..d9366069f2 100644 --- a/tests/validation/UNIT/GPUTarget.cpp +++ b/tests/validation/UNIT/GPUTarget.cpp @@ -50,6 +50,7 @@ TEST_CASE(GetGPUTargetFromName, framework::DatasetMode::ALL) ARM_COMPUTE_EXPECT(get_target_from_name("Mali-G52") == GPUTarget::G52, framework::LogLevel::ERRORS); ARM_COMPUTE_EXPECT(get_target_from_name("Mali-G52LIT") == GPUTarget::G52LIT, framework::LogLevel::ERRORS); ARM_COMPUTE_EXPECT(get_target_from_name("Mali-G76") == GPUTarget::G76, framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(get_target_from_name("Mali-G76 r0p0") == GPUTarget::G76, framework::LogLevel::ERRORS); ARM_COMPUTE_EXPECT(get_target_from_name("Mali-G77") == GPUTarget::G77, framework::LogLevel::ERRORS); ARM_COMPUTE_EXPECT(get_target_from_name("Mali-TBOX") == GPUTarget::TBOX, framework::LogLevel::ERRORS); ARM_COMPUTE_EXPECT(get_target_from_name("Mali-TODX") == GPUTarget::TODX, framework::LogLevel::ERRORS); |