From 4ffc42afafc8e6eee9917ac27b4bc510973335bf Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Tue, 1 Dec 2020 16:28:24 +0000 Subject: Add support for G78 instance Resolves:COMPMID-4034 Signed-off-by: Georgios Pinitas Change-Id: I6f18705c6060cab41db9168c03f1f4bb87393057 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4632 Tested-by: Arm Jenkins Reviewed-by: Michalis Spyrou Comments-Addressed: Arm Jenkins --- arm_compute/core/GPUTarget.h | 2 +- src/core/GPUTarget.cpp | 8 ++++---- tests/validation/UNIT/GPUTarget.cpp | 3 ++- utils/TypePrinter.h | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/arm_compute/core/GPUTarget.h b/arm_compute/core/GPUTarget.h index b8143f8d5c..d9994b6cf0 100644 --- a/arm_compute/core/GPUTarget.h +++ b/arm_compute/core/GPUTarget.h @@ -50,7 +50,7 @@ enum class GPUTarget G52LIT = 0x241, G76 = 0x250, G77 = 0x310, - TBOX = 0x320, + G78 = 0x320, TODX = 0x330, }; diff --git a/src/core/GPUTarget.cpp b/src/core/GPUTarget.cpp index 7e4ef2ff50..c1346b1fcc 100644 --- a/src/core/GPUTarget.cpp +++ b/src/core/GPUTarget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 Arm Limited. + * Copyright (c) 2018-2020 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -35,9 +35,9 @@ arm_compute::GPUTarget get_valhall_target(const std::string &version) { return arm_compute::GPUTarget::G77; } - else if(version.find("TBOX") != std::string::npos) + if(version.find("G78") != std::string::npos) { - return arm_compute::GPUTarget::TBOX; + return arm_compute::GPUTarget::G78; } else if(version.find("TODX") != std::string::npos) { @@ -131,7 +131,7 @@ const std::string &string_from_target(GPUTarget target) { GPUTarget::G52LIT, "g52lit" }, { GPUTarget::G76, "g76" }, { GPUTarget::G77, "g77" }, - { GPUTarget::TBOX, "tbox" }, + { GPUTarget::G78, "g78" }, { GPUTarget::TODX, "todx" } }; diff --git a/tests/validation/UNIT/GPUTarget.cpp b/tests/validation/UNIT/GPUTarget.cpp index 5d8c63bd85..e1b7e1fe3f 100644 --- a/tests/validation/UNIT/GPUTarget.cpp +++ b/tests/validation/UNIT/GPUTarget.cpp @@ -51,7 +51,8 @@ TEST_CASE(GetGPUTargetFromName, framework::DatasetMode::ALL) 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-G78") == GPUTarget::G78, framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(get_target_from_name("Mali-G78AE") == GPUTarget::G78, framework::LogLevel::ERRORS); ARM_COMPUTE_EXPECT(get_target_from_name("Mali-TODX") == GPUTarget::TODX, framework::LogLevel::ERRORS); ARM_COMPUTE_EXPECT(get_target_from_name("Mali-T000") == GPUTarget::MIDGARD, framework::LogLevel::ERRORS); } diff --git a/utils/TypePrinter.h b/utils/TypePrinter.h index 372d4e7629..3996d0ddce 100644 --- a/utils/TypePrinter.h +++ b/utils/TypePrinter.h @@ -2049,8 +2049,8 @@ inline ::std::ostream &operator<<(::std::ostream &os, const GPUTarget &gpu_targe case GPUTarget::G77: os << "G77"; break; - case GPUTarget::TBOX: - os << "TBOX"; + case GPUTarget::G78: + os << "G78"; break; case GPUTarget::TODX: os << "TODX"; -- cgit v1.2.1