diff options
| author | Moritz Pflanzer <moritz.pflanzer@arm.com> | 2017-09-07 09:48:04 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:35:24 +0000 |
| commit | c186b574e52b81c75e551cee46a6c4cc7d500c90 (patch) | |
| tree | 682add7d1b705eb6d0b79b1f9a7a039dbaa4287b /arm_compute/core/CPP | |
| parent | 3e05e4e85912e745b8555102e1bcef13478d2ceb (diff) | |
| download | ComputeLibrary-c186b574e52b81c75e551cee46a6c4cc7d500c90.tar.gz | |
COMPMID-481: Add thread info parameter
Change-Id: Iebb50a88d017445b6b37a86563ebd4abd86c5cf5
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/86788
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'arm_compute/core/CPP')
5 files changed, 12 insertions, 16 deletions
diff --git a/arm_compute/core/CPP/CPPTypes.h b/arm_compute/core/CPP/CPPTypes.h index 4e156ea78e..19036525d5 100644 --- a/arm_compute/core/CPP/CPPTypes.h +++ b/arm_compute/core/CPP/CPPTypes.h @@ -47,5 +47,12 @@ enum class CPUTarget A75 = (ARMV8_2 | A7x | 0x5), A75_DOT = (A75 | DOT), }; + +struct ThreadInfo +{ + int thread_id{ 0 }; + int num_threads{ 1 }; + CPUTarget cpu{ CPUTarget::INTRINSICS }; +}; } #endif /* __ARM_COMPUTE_CPP_TYPES_H__ */ diff --git a/arm_compute/core/CPP/ICPPKernel.h b/arm_compute/core/CPP/ICPPKernel.h index 9684408987..2e5600f5ff 100644 --- a/arm_compute/core/CPP/ICPPKernel.h +++ b/arm_compute/core/CPP/ICPPKernel.h @@ -47,20 +47,9 @@ public: * @note The width of the window has to be a multiple of num_elems_processed_per_iteration(). * * @param[in] window Region on which to execute the kernel. (Must be a region of the window returned by window()) + * @param[in] info Info about executing thread and CPU. */ - virtual void run(const Window &window) = 0; - - /** Sets the target CPU architecture. - * - * @param[in] target CPU target. - */ - void set_target(CPUTarget target) - { - _target = target; - } - -protected: - CPUTarget _target{ CPUTarget::INTRINSICS }; + virtual void run(const Window &window, const ThreadInfo &info) = 0; }; } #endif /*__ARM_COMPUTE_ICPPKERNEL_H__ */ diff --git a/arm_compute/core/CPP/kernels/CPPCornerCandidatesKernel.h b/arm_compute/core/CPP/kernels/CPPCornerCandidatesKernel.h index 28edb489ad..5309973f5d 100644 --- a/arm_compute/core/CPP/kernels/CPPCornerCandidatesKernel.h +++ b/arm_compute/core/CPP/kernels/CPPCornerCandidatesKernel.h @@ -62,7 +62,7 @@ public: void configure(const IImage *input, InternalKeypoint *output, int32_t *num_corner_candidates); // Inherited methods overridden: - void run(const Window &window) override; + void run(const Window &window, const ThreadInfo &info) override; private: int32_t *_num_corner_candidates; /**< Number of corner candidates */ diff --git a/arm_compute/core/CPP/kernels/CPPDetectionWindowNonMaximaSuppressionKernel.h b/arm_compute/core/CPP/kernels/CPPDetectionWindowNonMaximaSuppressionKernel.h index bcb3026959..2a9c0473bb 100644 --- a/arm_compute/core/CPP/kernels/CPPDetectionWindowNonMaximaSuppressionKernel.h +++ b/arm_compute/core/CPP/kernels/CPPDetectionWindowNonMaximaSuppressionKernel.h @@ -60,7 +60,7 @@ public: void configure(IDetectionWindowArray *input_output, float min_distance); // Inherited methods overridden: - void run(const Window &window) override; + void run(const Window &window, const ThreadInfo &info) override; bool is_parallelisable() const override; private: diff --git a/arm_compute/core/CPP/kernels/CPPSortEuclideanDistanceKernel.h b/arm_compute/core/CPP/kernels/CPPSortEuclideanDistanceKernel.h index b7a7d9ff9f..c6b47a512a 100644 --- a/arm_compute/core/CPP/kernels/CPPSortEuclideanDistanceKernel.h +++ b/arm_compute/core/CPP/kernels/CPPSortEuclideanDistanceKernel.h @@ -56,7 +56,7 @@ public: void configure(InternalKeypoint *in_out, IKeyPointArray *output, const int32_t *num_corner_candidates, float min_distance); // Inherited methods overridden: - void run(const Window &window) override; + void run(const Window &window, const ThreadInfo &info) override; bool is_parallelisable() const override; private: |