diff options
author | Gian Marco Iodice <gianmarco.iodice@arm.com> | 2022-01-19 10:06:45 +0000 |
---|---|---|
committer | Gian Marco Iodice <gianmarco.iodice@arm.com> | 2022-02-07 16:38:42 +0000 |
commit | ab2bc739525d3feb1ab1eef048b571bf270ef937 (patch) | |
tree | 5bef99a4c8adbb3f750e71e843ec200fd5260abd | |
parent | 9d9ad33df8c06184c23bd9ef25f95fdfe1846ad5 (diff) | |
download | ComputeLibrary-ab2bc739525d3feb1ab1eef048b571bf270ef937.tar.gz |
Adding support for Arm Mali-G710
Resolves COMPUTE-13901
Change-Id: Ib83d737066a55ab6452bdc34e3e4cba2d466d72a
Signed-off-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/6971
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Giorgio Arena <giorgio.arena@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
-rw-r--r-- | arm_compute/core/GPUTarget.h | 4 | ||||
-rw-r--r-- | src/core/GPUTarget.cpp | 22 | ||||
-rw-r--r-- | tests/validation/UNIT/GPUTarget.cpp | 4 | ||||
-rw-r--r-- | utils/TypePrinter.h | 6 |
4 files changed, 21 insertions, 15 deletions
diff --git a/arm_compute/core/GPUTarget.h b/arm_compute/core/GPUTarget.h index 04d2250d9d..c4f5b8ca42 100644 --- a/arm_compute/core/GPUTarget.h +++ b/arm_compute/core/GPUTarget.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021 Arm Limited. + * Copyright (c) 2018-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -52,7 +52,7 @@ enum class GPUTarget G76 = 0x250, G77 = 0x310, G78 = 0x320, - TODX = 0x330, + G710 = 0x330, }; /** Enable bitwise operations on GPUTarget enumerations */ diff --git a/src/core/GPUTarget.cpp b/src/core/GPUTarget.cpp index b4bd2ddf40..625c0145df 100644 --- a/src/core/GPUTarget.cpp +++ b/src/core/GPUTarget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021 Arm Limited. + * Copyright (c) 2018-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -39,13 +39,13 @@ arm_compute::GPUTarget get_valhall_target(const std::string &version) { return arm_compute::GPUTarget::G78; } - else if(version.find("TODX") != std::string::npos) + else if(version.find("G710") != std::string::npos) { - return arm_compute::GPUTarget::TODX; + return arm_compute::GPUTarget::G710; } else { - return arm_compute::GPUTarget::VALHALL; + return arm_compute::GPUTarget::UNKNOWN; } } @@ -136,7 +136,7 @@ const std::string &string_from_target(GPUTarget target) { GPUTarget::G76, "g76" }, { GPUTarget::G77, "g77" }, { GPUTarget::G78, "g78" }, - { GPUTarget::TODX, "todx" } + { GPUTarget::G710, "g710" } }; return gpu_target_map[target]; @@ -164,11 +164,17 @@ GPUTarget get_target_from_name(const std::string &device_name) GPUTarget gpu_target; if(target == 'G' || is_future_gpu) { - // Check for Bifrost or Valhall - gpu_target = get_bifrost_target(version); + // Check for Valhall or Bifrost + gpu_target = get_valhall_target(version); + if(gpu_target == GPUTarget::UNKNOWN) + { + gpu_target = get_bifrost_target(version); + } + + // Default GPUTarget if(gpu_target == GPUTarget::UNKNOWN) { - gpu_target = get_valhall_target(version); + gpu_target = GPUTarget::VALHALL; } } else if(target == 'T') diff --git a/tests/validation/UNIT/GPUTarget.cpp b/tests/validation/UNIT/GPUTarget.cpp index d2c81cf778..b5eccf6239 100644 --- a/tests/validation/UNIT/GPUTarget.cpp +++ b/tests/validation/UNIT/GPUTarget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021 Arm Limited. + * Copyright (c) 2018-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -52,7 +52,7 @@ TEST_CASE(GetGPUTargetFromName, framework::DatasetMode::ALL) ARM_COMPUTE_EXPECT(get_target_from_name("Mali-G77") == GPUTarget::G77, 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-G710") == GPUTarget::G710, 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 e152cf6fc3..664a39d150 100644 --- a/utils/TypePrinter.h +++ b/utils/TypePrinter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2021 Arm Limited. + * Copyright (c) 2017-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -2266,8 +2266,8 @@ inline ::std::ostream &operator<<(::std::ostream &os, const GPUTarget &gpu_targe case GPUTarget::G31: os << "G31"; break; - case GPUTarget::TODX: - os << "TODX"; + case GPUTarget::G710: + os << "G710"; break; default: ARM_COMPUTE_ERROR("NOT_SUPPORTED!"); |