IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

binding pcore for stream calculation (#19550)

Browse Source 
* binding pcore for stream calculation

* remove useless branch

* modify the function of query cache size

* fix compilation error

* use MT2.0 interface

* bind core when there is ecore

* initialize Xbyak::util::Cpu object at the begining of compile_model

* restore the file

* initialize Xbyak::util::Cpu object at the beginning of cpu plugin

* remove unused header

* extract task executor creation into a separate function

---------

Co-authored-by: Wanglei Shen <wanglei.shen@intel.com>
This commit is contained in:
Fang Xu
2023-11-23 12:14:36 +08:00
committed by GitHub
parent bd7b6b3358
commit 03d54a579e
4 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/inference/dev_api/openvino/runtime/threading/executor_manager.hpp
View File

@@ -72,6 +72,14 @@ public:
* @endcond
*/
virtual ~ExecutorManager() = default;
/**
* @brief create a temporary executor to execute the specific task
* @param core_type cpu core type
* @param task task to be performed
*/
virtual void execute_task_by_streams_executor(ov::threading::IStreamsExecutor::Config::PreferredCoreType core_type,
ov::threading::Task task) = 0;
};
OPENVINO_API std::shared_ptr<ExecutorManager> executor_manager();

14
src/inference/src/dev/threading/executor_manager.cpp
View File

@@ -34,6 +34,8 @@ public:
void clear(const std::string& id = {}) override;
void set_property(const ov::AnyMap& properties) override;
ov::Any get_property(const std::string& name) const override;
void execute_task_by_streams_executor(ov::threading::IStreamsExecutor::Config::PreferredCoreType core_type,
ov::threading::Task task) override;
private:
void reset_tbb();
@@ -176,6 +178,18 @@ void ExecutorManagerImpl::clear(const std::string& id) {
}
}
void ExecutorManagerImpl::execute_task_by_streams_executor(
ov::threading::IStreamsExecutor::Config::PreferredCoreType core_type,
ov::threading::Task task) {
ov::threading::IStreamsExecutor::Config streamsConfig("StreamsExecutor");
streamsConfig.update_executor_config(1, 1, core_type, false);
if (!streamsConfig._streams_info_table.empty()) {
auto taskExecutor = std::make_shared<ov::threading::CPUStreamsExecutor>(streamsConfig);
std::vector<Task> tasks{std::move(task)};
taskExecutor->run_and_wait(tasks);
}
}
namespace {
class ExecutorManagerHolder {

16
src/inference/src/dev/threading/istreams_executor.cpp
View File

@@ -592,12 +592,16 @@ void IStreamsExecutor::Config::update_executor_config(int stream_nums,
stream_info[ov::STREAM_SOCKET_ID] = 0;
if (core_type == ov::threading::IStreamsExecutor::Config::BIG) {
if (proc_type_table[0][ov::MAIN_CORE_PROC] < _streams) {
stream_info[ov::NUMBER_OF_STREAMS] = proc_type_table[0][ov::MAIN_CORE_PROC];
stream_info[ov::PROC_TYPE] = ov::MAIN_CORE_PROC;
_streams_info_table.push_back(stream_info);
stream_info[ov::NUMBER_OF_STREAMS] = proc_type_table[0][ov::HYPER_THREADING_PROC];
stream_info[ov::PROC_TYPE] = ov::HYPER_THREADING_PROC;
_streams_info_table.push_back(stream_info);
if (proc_type_table[0][ov::MAIN_CORE_PROC] > 0) {
stream_info[ov::NUMBER_OF_STREAMS] = proc_type_table[0][ov::MAIN_CORE_PROC];
stream_info[ov::PROC_TYPE] = ov::MAIN_CORE_PROC;
_streams_info_table.push_back(stream_info);
}
if (proc_type_table[0][ov::HYPER_THREADING_PROC] > 0) {
stream_info[ov::NUMBER_OF_STREAMS] = proc_type_table[0][ov::HYPER_THREADING_PROC];
stream_info[ov::PROC_TYPE] = ov::HYPER_THREADING_PROC;
_streams_info_table.push_back(stream_info);
}
} else {
stream_info[ov::PROC_TYPE] = ov::MAIN_CORE_PROC;
stream_info[ov::NUMBER_OF_STREAMS] = _streams;

4
src/plugins/intel_cpu/src/plugin.cpp
View File

@@ -171,6 +171,10 @@ Engine::Engine() :
deviceFullName(getDeviceFullName()),
specialSetup(new CPUSpecialSetup) {
set_device_name("CPU");
// Initialize Xbyak::util::Cpu object on Pcore for hybrid cores machine
get_executor_manager()->execute_task_by_streams_executor(IStreamsExecutor::Config::PreferredCoreType::BIG, [] {
dnnl::impl::cpu::x64::cpu();
});
extensionManager->AddExtension(std::make_shared<Extension>());
#if defined(OV_CPU_WITH_ACL)
scheduler_guard = SchedulerGuard::instance();