intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-19 06:24:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add HwHelper::getExtraExtensions"

Browse Source 
This reverts commit a9226a9113.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2021-08-27 01:39:31 +02:00
committed by Compute-Runtime-Automation
parent 3ab3761172
commit 946ae7cba3
10 changed files with 9 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opencl/source/cl_device/cl_device_caps.cpp
View File

@@ -217,7 +217,7 @@ void ClDevice::initializeCaps() {
deviceExtensions += "cl_khr_pci_bus_info ";
}
deviceExtensions += hwHelper.getExtensions(hwInfo);
deviceExtensions += hwHelper.getExtensions();
deviceInfo.deviceExtensions = deviceExtensions.c_str();
std::vector<std::string> exposedBuiltinKernelsVector;

4
shared/source/gen11/hw_helper_gen11.cpp
View File

@@ -11,8 +11,6 @@
#include "shared/source/helpers/hw_helper_bdw_and_later.inl"
#include "shared/source/helpers/hw_helper_bdw_to_icllp.inl"
#include "hw_helper_extra.inl"
namespace NEO {
typedef ICLFamily Family;
@@ -22,7 +20,7 @@ uint32_t HwHelperHw<Family>::getComputeUnitsUsedForScratch(const HardwareInfo *p
}
template <>
std::string HwHelperHw<Family>::getExtensions(const HardwareInfo &hwInfo) const {
std::string HwHelperHw<Family>::getExtensions() const {
return "cl_intel_subgroup_local_block_io ";
}

3
shared/source/gen12lp/hw_helper_gen12lp.cpp
View File

@@ -18,7 +18,6 @@ using Family = NEO::TGLLPFamily;
#include "shared/source/os_interface/hw_info_config.h"
#include "engine_node.h"
#include "hw_helper_extra.inl"
namespace NEO {
@@ -197,7 +196,7 @@ void MemorySynchronizationCommands<Family>::addPipeControlWA(LinearStream &comma
}
template <>
std::string HwHelperHw<Family>::getExtensions(const HardwareInfo &hwInfo) const {
std::string HwHelperHw<Family>::getExtensions() const {
return "cl_intel_subgroup_local_block_io ";
}

2
shared/source/gen8/hw_helper_gen8.cpp
View File

@@ -12,8 +12,6 @@
#include "shared/source/helpers/hw_helper_bdw_and_later.inl"
#include "shared/source/helpers/hw_helper_bdw_to_icllp.inl"
#include "hw_helper_extra.inl"
namespace NEO {
typedef BDWFamily Family;

2
shared/source/gen9/hw_helper_gen9.cpp
View File

@@ -11,8 +11,6 @@
#include "shared/source/helpers/hw_helper_bdw_and_later.inl"
#include "shared/source/helpers/hw_helper_bdw_to_icllp.inl"
#include "hw_helper_extra.inl"
#include <cstring>
namespace NEO {

5
shared/source/helpers/CMakeLists.txt
View File

@@ -110,9 +110,8 @@ set(NEO_CORE_HELPERS
${CMAKE_CURRENT_SOURCE_DIR}/uint16_avx2.h
${CMAKE_CURRENT_SOURCE_DIR}/uint16_sse4.h
${CMAKE_CURRENT_SOURCE_DIR}/vec.h
${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/engine_group_types.h
${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/hw_cmds.h
${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/hw_helper_extra.inl
${CMAKE_CURRENT_SOURCE_DIR}/definitions/${BRANCH_DIR_SUFFIX}/hw_cmds.h
${CMAKE_CURRENT_SOURCE_DIR}/definitions/${BRANCH_DIR_SUFFIX}/engine_group_types.h
${CMAKE_CURRENT_SOURCE_DIR}/definitions/mi_flush_args.h
${CMAKE_CURRENT_SOURCE_DIR}/definitions/pipe_control_args_base.h
${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/pipe_control_args.h

17
shared/source/helpers/definitions/hw_helper_extra.inl
View File

@@ -1,17 +0,0 @@
/*
* Copyright (C) 2021 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "shared/source/helpers/hw_helper.h"
namespace NEO {
template <typename GfxFamily>
std::string HwHelperHw<GfxFamily>::getExtraExtensions(const HardwareInfo &hwInfo) const {
return "";
}
} // namespace NEO

7
shared/source/helpers/hw_helper.h
View File

@@ -93,7 +93,7 @@ class HwHelper {
virtual const StackVec<size_t, 3> getDeviceSubGroupSizes() const = 0;
virtual const StackVec<uint32_t, 6> getThreadsPerEUConfigs() const = 0;
virtual bool getEnableLocalMemory(const HardwareInfo &hwInfo) const = 0;
virtual std::string getExtensions(const HardwareInfo &hwInfo) const = 0;
virtual std::string getExtensions() const = 0;
virtual std::string getDeviceMemoryName() const = 0;
static uint32_t getMaxThreadsForVfe(const HardwareInfo &hwInfo);
virtual uint32_t getMetricsLibraryGenId() const = 0;
@@ -157,7 +157,6 @@ class HwHelper {
protected:
virtual LocalMemoryAccessMode getDefaultLocalMemoryAccessMode(const HardwareInfo &hwInfo) const = 0;
virtual std::string getExtraExtensions(const HardwareInfo &hwInfo) const = 0;
HwHelper() = default;
};
@@ -266,7 +265,7 @@ class HwHelperHw : public HwHelper {
bool getEnableLocalMemory(const HardwareInfo &hwInfo) const override;
std::string getExtensions(const HardwareInfo &hwInfo) const override;
std::string getExtensions() const override;
std::string getDeviceMemoryName() const override;
@@ -388,8 +387,6 @@ class HwHelperHw : public HwHelper {
protected:
LocalMemoryAccessMode getDefaultLocalMemoryAccessMode(const HardwareInfo &hwInfo) const override;
std::string getExtraExtensions(const HardwareInfo &hwInfo) const override;
static const AuxTranslationMode defaultAuxTranslationMode;
HwHelperHw() = default;
};

2
shared/source/helpers/hw_helper_bdw_and_later.inl
View File

@@ -70,7 +70,7 @@ EngineGroupType HwHelperHw<GfxFamily>::getEngineGroupType(aub_stream::EngineType
}
template <typename GfxFamily>
std::string HwHelperHw<GfxFamily>::getExtensions(const HardwareInfo &hwInfo) const {
std::string HwHelperHw<GfxFamily>::getExtensions() const {
return "";
}

6
shared/source/xe_hp_core/hw_helper_xe_hp_core.cpp
View File

@@ -19,8 +19,6 @@ using Family = NEO::XeHpFamily;
#include "shared/source/helpers/hw_helper_xehp_and_later.inl"
#include "shared/source/os_interface/hw_info_config.h"
#include "hw_helper_extra.inl"
namespace NEO {
template <>
const AuxTranslationMode HwHelperHw<Family>::defaultAuxTranslationMode = AuxTranslationMode::Blit;
@@ -165,13 +163,11 @@ const StackVec<uint32_t, 6> HwHelperHw<Family>::getThreadsPerEUConfigs() const {
}
template <>
std::string HwHelperHw<Family>::getExtensions(const HardwareInfo &hwInfo) const {
std::string HwHelperHw<Family>::getExtensions() const {
std::string extensions;
extensions += "cl_intel_dot_accumulate ";
extensions += "cl_intel_subgroup_local_block_io ";
extensions += getExtraExtensions(hwInfo);
return extensions;
}