Clean up macro definitions in arm_compute headers

- Expose loose macros by prefixing "ARM_COMPUTE_"

Resolves: COMPMID-3701

Signed-off-by: Giorgio Arena <giorgio.arena@arm.com>
Change-Id: I4334b01c1a5cd8585f4a1ba2d870be956c61a83d
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4769
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>

1 files changed, 139 insertions, 139 deletions

diff --git a/src/core/TracePoint.cpp b/src/core/TracePoint.cpp
index d67faad868..69374fbc8c 100644
--- a/src/core/TracePoint.cpp
+++ b/src/core/TracePoint.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Arm Limited.
+ * Copyright (c) 2020-2021 Arm Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -123,150 +123,150 @@ std::string to_ptr_string(const void *arg)
     return ss.str();
 }
 
-TRACE_TO_STRING(ThresholdType)
-TRACE_TO_STRING(IDetectionWindowArray)
-TRACE_TO_STRING(ICoordinates2DArray)
-TRACE_TO_STRING(IMultiImage)
+ARM_COMPUTE_TRACE_TO_STRING(ThresholdType)
+ARM_COMPUTE_TRACE_TO_STRING(IDetectionWindowArray)
+ARM_COMPUTE_TRACE_TO_STRING(ICoordinates2DArray)
+ARM_COMPUTE_TRACE_TO_STRING(IMultiImage)
 using pair_uint = std::pair<unsigned int, unsigned int>;
-TRACE_TO_STRING(pair_uint)
-TRACE_TO_STRING(IKeyPointArray)
-TRACE_TO_STRING(IDistribution1D)
-TRACE_TO_STRING(IHOG)
-TRACE_TO_STRING(ILut)
-TRACE_TO_STRING(IPyramid)
-TRACE_TO_STRING(IMultiHOG)
-TRACE_TO_STRING(ISize2DArray)
-TRACE_TO_STRING(MemoryGroup)
-TRACE_TO_STRING(BoxNMSLimitInfo)
-TRACE_TO_STRING(DepthwiseConvolutionReshapeInfo)
-TRACE_TO_STRING(DWCWeightsKernelInfo)
-TRACE_TO_STRING(DWCKernelInfo)
-TRACE_TO_STRING(GEMMLHSMatrixInfo)
-TRACE_TO_STRING(GEMMRHSMatrixInfo)
-TRACE_TO_STRING(GEMMKernelInfo)
-TRACE_TO_STRING(InstanceNormalizationLayerKernelInfo)
-TRACE_TO_STRING(SoftmaxKernelInfo)
-TRACE_TO_STRING(FuseBatchNormalizationType)
-TRACE_TO_STRING(DirectConvolutionLayerOutputStageKernelInfo)
-TRACE_TO_STRING(FFTScaleKernelInfo)
-TRACE_TO_STRING(GEMMLowpOutputStageInfo)
-TRACE_TO_STRING(FFT1DInfo)
-TRACE_TO_STRING(FFT2DInfo)
-TRACE_TO_STRING(FFTDigitReverseKernelInfo)
-TRACE_TO_STRING(FFTRadixStageKernelInfo)
-TRACE_TO_STRING(IWeightsManager)
-TRACE_TO_STRING(Coordinates2D)
-TRACE_TO_STRING(ITensorInfo)
-TRACE_TO_STRING(InternalKeypoint)
-TRACE_TO_STRING(arm_gemm::Nothing)
-TRACE_TO_STRING(PixelValue)
-TRACE_TO_STRING(std::allocator<ITensor const *>)
+ARM_COMPUTE_TRACE_TO_STRING(pair_uint)
+ARM_COMPUTE_TRACE_TO_STRING(IKeyPointArray)
+ARM_COMPUTE_TRACE_TO_STRING(IDistribution1D)
+ARM_COMPUTE_TRACE_TO_STRING(IHOG)
+ARM_COMPUTE_TRACE_TO_STRING(ILut)
+ARM_COMPUTE_TRACE_TO_STRING(IPyramid)
+ARM_COMPUTE_TRACE_TO_STRING(IMultiHOG)
+ARM_COMPUTE_TRACE_TO_STRING(ISize2DArray)
+ARM_COMPUTE_TRACE_TO_STRING(MemoryGroup)
+ARM_COMPUTE_TRACE_TO_STRING(BoxNMSLimitInfo)
+ARM_COMPUTE_TRACE_TO_STRING(DepthwiseConvolutionReshapeInfo)
+ARM_COMPUTE_TRACE_TO_STRING(DWCWeightsKernelInfo)
+ARM_COMPUTE_TRACE_TO_STRING(DWCKernelInfo)
+ARM_COMPUTE_TRACE_TO_STRING(GEMMLHSMatrixInfo)
+ARM_COMPUTE_TRACE_TO_STRING(GEMMRHSMatrixInfo)
+ARM_COMPUTE_TRACE_TO_STRING(GEMMKernelInfo)
+ARM_COMPUTE_TRACE_TO_STRING(InstanceNormalizationLayerKernelInfo)
+ARM_COMPUTE_TRACE_TO_STRING(SoftmaxKernelInfo)
+ARM_COMPUTE_TRACE_TO_STRING(FuseBatchNormalizationType)
+ARM_COMPUTE_TRACE_TO_STRING(DirectConvolutionLayerOutputStageKernelInfo)
+ARM_COMPUTE_TRACE_TO_STRING(FFTScaleKernelInfo)
+ARM_COMPUTE_TRACE_TO_STRING(GEMMLowpOutputStageInfo)
+ARM_COMPUTE_TRACE_TO_STRING(FFT1DInfo)
+ARM_COMPUTE_TRACE_TO_STRING(FFT2DInfo)
+ARM_COMPUTE_TRACE_TO_STRING(FFTDigitReverseKernelInfo)
+ARM_COMPUTE_TRACE_TO_STRING(FFTRadixStageKernelInfo)
+ARM_COMPUTE_TRACE_TO_STRING(IWeightsManager)
+ARM_COMPUTE_TRACE_TO_STRING(Coordinates2D)
+ARM_COMPUTE_TRACE_TO_STRING(ITensorInfo)
+ARM_COMPUTE_TRACE_TO_STRING(InternalKeypoint)
+ARM_COMPUTE_TRACE_TO_STRING(arm_gemm::Nothing)
+ARM_COMPUTE_TRACE_TO_STRING(PixelValue)
+ARM_COMPUTE_TRACE_TO_STRING(std::allocator<ITensor const *>)
 using array_f32 = std::array<float, 9ul>;
-TRACE_TO_STRING(array_f32)
+ARM_COMPUTE_TRACE_TO_STRING(array_f32)
 
-CONST_REF_CLASS(arm_gemm::GemmArgs)
-CONST_REF_CLASS(arm_gemm::Nothing)
-CONST_REF_CLASS(arm_gemm::Activation)
-CONST_REF_CLASS(DirectConvolutionLayerOutputStageKernelInfo)
-CONST_REF_CLASS(GEMMLowpOutputStageInfo)
-CONST_REF_CLASS(DWCWeightsKernelInfo)
-CONST_REF_CLASS(DWCKernelInfo)
-CONST_REF_CLASS(DepthwiseConvolutionReshapeInfo)
-CONST_REF_CLASS(GEMMLHSMatrixInfo)
-CONST_REF_CLASS(GEMMRHSMatrixInfo)
-CONST_REF_CLASS(GEMMKernelInfo)
-CONST_REF_CLASS(InstanceNormalizationLayerKernelInfo)
-CONST_REF_CLASS(SoftmaxKernelInfo)
-CONST_REF_CLASS(PaddingMode)
-CONST_REF_CLASS(Coordinates)
-CONST_REF_CLASS(FFT1DInfo)
-CONST_REF_CLASS(FFT2DInfo)
-CONST_REF_CLASS(FFTDigitReverseKernelInfo)
-CONST_REF_CLASS(FFTRadixStageKernelInfo)
-CONST_REF_CLASS(FFTScaleKernelInfo)
-CONST_REF_CLASS(MemoryGroup)
-CONST_REF_CLASS(IWeightsManager)
-CONST_REF_CLASS(ActivationLayerInfo)
-CONST_REF_CLASS(PoolingLayerInfo)
-CONST_REF_CLASS(PadStrideInfo)
-CONST_REF_CLASS(NormalizationLayerInfo)
-CONST_REF_CLASS(Size2D)
-CONST_REF_CLASS(WeightsInfo)
-CONST_REF_CLASS(GEMMInfo)
-CONST_REF_CLASS(GEMMReshapeInfo)
-CONST_REF_CLASS(Window)
-CONST_REF_CLASS(BorderSize)
-CONST_REF_CLASS(BorderMode)
-CONST_REF_CLASS(PhaseType)
-CONST_REF_CLASS(MagnitudeType)
-CONST_REF_CLASS(Termination)
-CONST_REF_CLASS(ReductionOperation)
-CONST_REF_CLASS(InterpolationPolicy)
-CONST_REF_CLASS(SamplingPolicy)
-CONST_REF_CLASS(DataType)
-CONST_REF_CLASS(DataLayout)
-CONST_REF_CLASS(Channel)
-CONST_REF_CLASS(ConvertPolicy)
-CONST_REF_CLASS(TensorShape)
-CONST_REF_CLASS(PixelValue)
-CONST_REF_CLASS(Strides)
-CONST_REF_CLASS(WinogradInfo)
-CONST_REF_CLASS(RoundingPolicy)
-CONST_REF_CLASS(MatrixPattern)
-CONST_REF_CLASS(NonLinearFilterFunction)
-CONST_REF_CLASS(ThresholdType)
-CONST_REF_CLASS(ROIPoolingLayerInfo)
-CONST_REF_CLASS(BoundingBoxTransformInfo)
-CONST_REF_CLASS(ComparisonOperation)
-CONST_REF_CLASS(ArithmeticOperation)
-CONST_REF_CLASS(BoxNMSLimitInfo)
-CONST_REF_CLASS(FuseBatchNormalizationType)
-CONST_REF_CLASS(ElementWiseUnary)
-CONST_REF_CLASS(ComputeAnchorsInfo)
-CONST_REF_CLASS(PriorBoxLayerInfo)
-CONST_REF_CLASS(DetectionOutputLayerInfo)
-CONST_REF_CLASS(Coordinates2D)
-CONST_REF_CLASS(std::vector<const ITensor *>)
-CONST_REF_CLASS(std::vector<ITensor *>)
-CONST_REF_CLASS(std::vector<pair_uint>)
-CONST_REF_CLASS(pair_uint)
-CONST_REF_CLASS(array_f32)
+ARM_COMPUTE_CONST_REF_CLASS(arm_gemm::GemmArgs)
+ARM_COMPUTE_CONST_REF_CLASS(arm_gemm::Nothing)
+ARM_COMPUTE_CONST_REF_CLASS(arm_gemm::Activation)
+ARM_COMPUTE_CONST_REF_CLASS(DirectConvolutionLayerOutputStageKernelInfo)
+ARM_COMPUTE_CONST_REF_CLASS(GEMMLowpOutputStageInfo)
+ARM_COMPUTE_CONST_REF_CLASS(DWCWeightsKernelInfo)
+ARM_COMPUTE_CONST_REF_CLASS(DWCKernelInfo)
+ARM_COMPUTE_CONST_REF_CLASS(DepthwiseConvolutionReshapeInfo)
+ARM_COMPUTE_CONST_REF_CLASS(GEMMLHSMatrixInfo)
+ARM_COMPUTE_CONST_REF_CLASS(GEMMRHSMatrixInfo)
+ARM_COMPUTE_CONST_REF_CLASS(GEMMKernelInfo)
+ARM_COMPUTE_CONST_REF_CLASS(InstanceNormalizationLayerKernelInfo)
+ARM_COMPUTE_CONST_REF_CLASS(SoftmaxKernelInfo)
+ARM_COMPUTE_CONST_REF_CLASS(PaddingMode)
+ARM_COMPUTE_CONST_REF_CLASS(Coordinates)
+ARM_COMPUTE_CONST_REF_CLASS(FFT1DInfo)
+ARM_COMPUTE_CONST_REF_CLASS(FFT2DInfo)
+ARM_COMPUTE_CONST_REF_CLASS(FFTDigitReverseKernelInfo)
+ARM_COMPUTE_CONST_REF_CLASS(FFTRadixStageKernelInfo)
+ARM_COMPUTE_CONST_REF_CLASS(FFTScaleKernelInfo)
+ARM_COMPUTE_CONST_REF_CLASS(MemoryGroup)
+ARM_COMPUTE_CONST_REF_CLASS(IWeightsManager)
+ARM_COMPUTE_CONST_REF_CLASS(ActivationLayerInfo)
+ARM_COMPUTE_CONST_REF_CLASS(PoolingLayerInfo)
+ARM_COMPUTE_CONST_REF_CLASS(PadStrideInfo)
+ARM_COMPUTE_CONST_REF_CLASS(NormalizationLayerInfo)
+ARM_COMPUTE_CONST_REF_CLASS(Size2D)
+ARM_COMPUTE_CONST_REF_CLASS(WeightsInfo)
+ARM_COMPUTE_CONST_REF_CLASS(GEMMInfo)
+ARM_COMPUTE_CONST_REF_CLASS(GEMMReshapeInfo)
+ARM_COMPUTE_CONST_REF_CLASS(Window)
+ARM_COMPUTE_CONST_REF_CLASS(BorderSize)
+ARM_COMPUTE_CONST_REF_CLASS(BorderMode)
+ARM_COMPUTE_CONST_REF_CLASS(PhaseType)
+ARM_COMPUTE_CONST_REF_CLASS(MagnitudeType)
+ARM_COMPUTE_CONST_REF_CLASS(Termination)
+ARM_COMPUTE_CONST_REF_CLASS(ReductionOperation)
+ARM_COMPUTE_CONST_REF_CLASS(InterpolationPolicy)
+ARM_COMPUTE_CONST_REF_CLASS(SamplingPolicy)
+ARM_COMPUTE_CONST_REF_CLASS(DataType)
+ARM_COMPUTE_CONST_REF_CLASS(DataLayout)
+ARM_COMPUTE_CONST_REF_CLASS(Channel)
+ARM_COMPUTE_CONST_REF_CLASS(ConvertPolicy)
+ARM_COMPUTE_CONST_REF_CLASS(TensorShape)
+ARM_COMPUTE_CONST_REF_CLASS(PixelValue)
+ARM_COMPUTE_CONST_REF_CLASS(Strides)
+ARM_COMPUTE_CONST_REF_CLASS(WinogradInfo)
+ARM_COMPUTE_CONST_REF_CLASS(RoundingPolicy)
+ARM_COMPUTE_CONST_REF_CLASS(MatrixPattern)
+ARM_COMPUTE_CONST_REF_CLASS(NonLinearFilterFunction)
+ARM_COMPUTE_CONST_REF_CLASS(ThresholdType)
+ARM_COMPUTE_CONST_REF_CLASS(ROIPoolingLayerInfo)
+ARM_COMPUTE_CONST_REF_CLASS(BoundingBoxTransformInfo)
+ARM_COMPUTE_CONST_REF_CLASS(ComparisonOperation)
+ARM_COMPUTE_CONST_REF_CLASS(ArithmeticOperation)
+ARM_COMPUTE_CONST_REF_CLASS(BoxNMSLimitInfo)
+ARM_COMPUTE_CONST_REF_CLASS(FuseBatchNormalizationType)
+ARM_COMPUTE_CONST_REF_CLASS(ElementWiseUnary)
+ARM_COMPUTE_CONST_REF_CLASS(ComputeAnchorsInfo)
+ARM_COMPUTE_CONST_REF_CLASS(PriorBoxLayerInfo)
+ARM_COMPUTE_CONST_REF_CLASS(DetectionOutputLayerInfo)
+ARM_COMPUTE_CONST_REF_CLASS(Coordinates2D)
+ARM_COMPUTE_CONST_REF_CLASS(std::vector<const ITensor *>)
+ARM_COMPUTE_CONST_REF_CLASS(std::vector<ITensor *>)
+ARM_COMPUTE_CONST_REF_CLASS(std::vector<pair_uint>)
+ARM_COMPUTE_CONST_REF_CLASS(pair_uint)
+ARM_COMPUTE_CONST_REF_CLASS(array_f32)
 
-CONST_PTR_CLASS(ITensor)
-CONST_PTR_CLASS(ITensorInfo)
-CONST_PTR_CLASS(IWeightsManager)
-CONST_PTR_CLASS(InternalKeypoint)
-CONST_PTR_CLASS(IDetectionWindowArray)
-CONST_PTR_CLASS(ICoordinates2DArray)
-CONST_PTR_CLASS(IMultiImage)
-CONST_PTR_CLASS(Window)
-CONST_PTR_CLASS(IKeyPointArray)
-CONST_PTR_CLASS(HOGInfo)
-CONST_PTR_CLASS(IDistribution1D)
-CONST_PTR_CLASS(IHOG)
-CONST_PTR_CLASS(ILut)
-CONST_PTR_CLASS(IPyramid)
-CONST_PTR_CLASS(IMultiHOG)
-CONST_PTR_CLASS(ISize2DArray)
-CONST_PTR_CLASS(std::allocator<ITensor const *>)
-CONST_PTR_CLASS(std::vector<unsigned int>)
+ARM_COMPUTE_CONST_PTR_CLASS(ITensor)
+ARM_COMPUTE_CONST_PTR_CLASS(ITensorInfo)
+ARM_COMPUTE_CONST_PTR_CLASS(IWeightsManager)
+ARM_COMPUTE_CONST_PTR_CLASS(InternalKeypoint)
+ARM_COMPUTE_CONST_PTR_CLASS(IDetectionWindowArray)
+ARM_COMPUTE_CONST_PTR_CLASS(ICoordinates2DArray)
+ARM_COMPUTE_CONST_PTR_CLASS(IMultiImage)
+ARM_COMPUTE_CONST_PTR_CLASS(Window)
+ARM_COMPUTE_CONST_PTR_CLASS(IKeyPointArray)
+ARM_COMPUTE_CONST_PTR_CLASS(HOGInfo)
+ARM_COMPUTE_CONST_PTR_CLASS(IDistribution1D)
+ARM_COMPUTE_CONST_PTR_CLASS(IHOG)
+ARM_COMPUTE_CONST_PTR_CLASS(ILut)
+ARM_COMPUTE_CONST_PTR_CLASS(IPyramid)
+ARM_COMPUTE_CONST_PTR_CLASS(IMultiHOG)
+ARM_COMPUTE_CONST_PTR_CLASS(ISize2DArray)
+ARM_COMPUTE_CONST_PTR_CLASS(std::allocator<ITensor const *>)
+ARM_COMPUTE_CONST_PTR_CLASS(std::vector<unsigned int>)
 
-CONST_REF_SIMPLE(bool)
-CONST_REF_SIMPLE(uint64_t)
-CONST_REF_SIMPLE(int64_t)
-CONST_REF_SIMPLE(uint32_t)
-CONST_REF_SIMPLE(int32_t)
-CONST_REF_SIMPLE(int16_t)
-CONST_REF_SIMPLE(float)
+ARM_COMPUTE_CONST_REF_SIMPLE(bool)
+ARM_COMPUTE_CONST_REF_SIMPLE(uint64_t)
+ARM_COMPUTE_CONST_REF_SIMPLE(int64_t)
+ARM_COMPUTE_CONST_REF_SIMPLE(uint32_t)
+ARM_COMPUTE_CONST_REF_SIMPLE(int32_t)
+ARM_COMPUTE_CONST_REF_SIMPLE(int16_t)
+ARM_COMPUTE_CONST_REF_SIMPLE(float)
 
-CONST_PTR_ADDRESS(float)
-CONST_PTR_ADDRESS(uint8_t)
-CONST_PTR_ADDRESS(void)
-CONST_PTR_ADDRESS(short)
-CONST_PTR_ADDRESS(int)
-CONST_PTR_ADDRESS(uint64_t)
-CONST_PTR_ADDRESS(uint32_t)
-CONST_PTR_ADDRESS(uint16_t)
+ARM_COMPUTE_CONST_PTR_ADDRESS(float)
+ARM_COMPUTE_CONST_PTR_ADDRESS(uint8_t)
+ARM_COMPUTE_CONST_PTR_ADDRESS(void)
+ARM_COMPUTE_CONST_PTR_ADDRESS(short)
+ARM_COMPUTE_CONST_PTR_ADDRESS(int)
+ARM_COMPUTE_CONST_PTR_ADDRESS(uint64_t)
+ARM_COMPUTE_CONST_PTR_ADDRESS(uint32_t)
+ARM_COMPUTE_CONST_PTR_ADDRESS(uint16_t)
 
 template <>
 TracePoint::Args &&operator<<(TracePoint::Args &&tp, const uint16_t &arg)