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

Use const values instead of constexpr from std::array::size()

Browse Source 
Change-Id: I705888b77801cd32487c4d53fc320cf839ec9079
Signed-off-by: Dunajski, Bartosz <bartosz.dunajski@intel.com>
This commit is contained in:
Dunajski, Bartosz
2018-11-28 09:42:11 +01:00
committed by sys_ocldev
parent 42ba6c10fc
commit d39309adf2
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/command_stream/aub_command_stream_receiver_hw.h
View File

@@ -105,8 +105,8 @@ class AUBCommandStreamReceiverHw : public CommandStreamReceiverSimulatedHw<GfxFa
uint32_t ggttRingBuffer; uint32_t ggttRingBuffer;
size_t sizeRingBuffer; size_t sizeRingBuffer;
uint32_t tailRingBuffer; uint32_t tailRingBuffer;
} engineInfoTable[allEngineInstances.size()] = {}; } engineInfoTable[EngineInstanceT::numAllEngineInstances] = {};
size_t gpgpuEngineIndex = gpgpuEngineInstances.size() - 1; size_t gpgpuEngineIndex = EngineInstanceT::numGpgpuEngineInstances - 1;
std::unique_ptr<AubSubCaptureManager> subCaptureManager; std::unique_ptr<AubSubCaptureManager> subCaptureManager;
uint32_t aubDeviceId; uint32_t aubDeviceId;

7
runtime/command_stream/definitions/engine_node.h
View File

@@ -20,6 +20,9 @@ enum EngineType : uint32_t {
}; };
struct EngineInstanceT { struct EngineInstanceT {
static const size_t numAllEngineInstances = 5;
static const size_t numGpgpuEngineInstances = 2;
constexpr EngineInstanceT(EngineType type) : type(type), id(0) {} constexpr EngineInstanceT(EngineType type) : type(type), id(0) {}
constexpr EngineInstanceT(EngineType type, int id) : type(type), id(id) {} constexpr EngineInstanceT(EngineType type, int id) : type(type), id(id) {}
@@ -27,7 +30,7 @@ struct EngineInstanceT {
int id; int id;
}; };
static constexpr std::array<EngineInstanceT, 5> allEngineInstances = {{ static constexpr std::array<EngineInstanceT, EngineInstanceT::numAllEngineInstances> allEngineInstances = {{
{ENGINE_RCS, 0}, {ENGINE_RCS, 0},
{ENGINE_RCS, 1}, {ENGINE_RCS, 1},
{ENGINE_BCS}, {ENGINE_BCS},
@@ -35,7 +38,7 @@ static constexpr std::array<EngineInstanceT, 5> allEngineInstances = {{
{ENGINE_VECS}, {ENGINE_VECS},
}}; }};
static constexpr std::array<EngineInstanceT, 2> gpgpuEngineInstances = {{ static constexpr std::array<EngineInstanceT, EngineInstanceT::numGpgpuEngineInstances> gpgpuEngineInstances = {{
{ENGINE_RCS, 0}, {ENGINE_RCS, 0},
{ENGINE_RCS, 1}, {ENGINE_RCS, 1},
}}; }};

2
runtime/device/device.h
View File

@@ -152,7 +152,7 @@ class Device : public BaseObject<_cl_device_id> {
std::unique_ptr<DriverInfo> driverInfo; std::unique_ptr<DriverInfo> driverInfo;
std::unique_ptr<PerformanceCounters> performanceCounters; std::unique_ptr<PerformanceCounters> performanceCounters;
std::array<EngineControl, gpgpuEngineInstances.size()> engines = {{}}; std::array<EngineControl, EngineInstanceT::numGpgpuEngineInstances> engines = {{}};
void *slmWindowStartAddress = nullptr; void *slmWindowStartAddress = nullptr;

2
runtime/execution_environment/execution_environment.h
View File

@@ -24,7 +24,7 @@ class BuiltIns;
struct HardwareInfo; struct HardwareInfo;
class OSInterface; class OSInterface;
using CsrContainer = std::array<std::unique_ptr<CommandStreamReceiver>, gpgpuEngineInstances.size()>; using CsrContainer = std::array<std::unique_ptr<CommandStreamReceiver>, EngineInstanceT::numGpgpuEngineInstances>;
class ExecutionEnvironment : public ReferenceTrackedObject<ExecutionEnvironment> { class ExecutionEnvironment : public ReferenceTrackedObject<ExecutionEnvironment> {
private: private: