P4 to Git Change 1527320 by cpaquot@cpaquot-ocl-lc-lnx on 2018/03/14 18:54:10

SWDEV-145570 - Remove all g_context from runtime device implementation

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_device.cpp#6 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_device_runtime.cpp#2 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_internal.hpp#3 edit
This commit is contained in:
foreman
2018-03-14 19:05:10 -04:00
parent df8dfbd060
commit 41c27a9e24
3 changed files with 109 additions and 92 deletions
+82
View File
@@ -86,6 +86,19 @@ hipError_t hipDeviceComputeCapability(int *major, int *minor, hipDevice_t device
return hipSuccess;
}
hipError_t hipDeviceGetCount(int* count) {
HIP_INIT_API(count);
if (count == nullptr) {
return hipErrorInvalidValue;
}
// Get all available devices
*count = g_context->devices().size();
return hipSuccess;
}
hipError_t hipDeviceGetName(char *name, int len, hipDevice_t device) {
HIP_INIT_API((void*)name, len, device);
@@ -106,3 +119,72 @@ hipError_t hipDeviceGetName(char *name, int len, hipDevice_t device) {
return hipSuccess;
}
hipError_t hipGetDeviceProperties ( hipDeviceProp_t* props, hipDevice_t device ) {
HIP_INIT_API(props, device);
if (props == nullptr) {
return hipErrorInvalidValue;
}
if (unsigned(device) >= g_context->devices().size()) {
return hipErrorInvalidDevice;
}
auto* deviceHandle = g_context->devices()[device];
hipDeviceProp_t deviceProps = {0};
const auto& info = deviceHandle->info();
::strncpy(deviceProps.name, info.boardName_, 128);
deviceProps.totalGlobalMem = info.globalMemSize_;
deviceProps.sharedMemPerBlock = info.localMemSizePerCU_;
deviceProps.regsPerBlock = info.availableSGPRs_;
deviceProps.warpSize = info.wavefrontWidth_;
deviceProps.maxThreadsPerBlock = info.maxWorkGroupSize_;
deviceProps.maxThreadsDim[0] = info.maxWorkItemSizes_[0];
deviceProps.maxThreadsDim[1] = info.maxWorkItemSizes_[1];
deviceProps.maxThreadsDim[2] = info.maxWorkItemSizes_[2];
deviceProps.maxGridSize[0] = UINT32_MAX;
deviceProps.maxGridSize[1] = UINT32_MAX;
deviceProps.maxGridSize[2] = UINT32_MAX;
deviceProps.clockRate = info.maxEngineClockFrequency_;
deviceProps.memoryClockRate = info.maxMemoryClockFrequency_;
deviceProps.memoryBusWidth = info.globalMemChannels_ * 32;
deviceProps.totalConstMem = info.maxConstantBufferSize_;
deviceProps.major = info.gfxipVersion_ / 100;
deviceProps.minor = info.gfxipVersion_ % 100;
deviceProps.multiProcessorCount = info.maxComputeUnits_;
deviceProps.l2CacheSize = info.l2CacheSize_;
deviceProps.maxThreadsPerMultiProcessor = info.simdPerCU_;
deviceProps.computeMode = 0;
deviceProps.clockInstructionRate = info.timeStampFrequency_;
deviceProps.arch.hasGlobalInt32Atomics = 1;
deviceProps.arch.hasGlobalFloatAtomicExch = 1;
deviceProps.arch.hasSharedInt32Atomics = 1;
deviceProps.arch.hasSharedFloatAtomicExch = 1;
deviceProps.arch.hasFloatAtomicAdd = 0;
deviceProps.arch.hasGlobalInt64Atomics = 1;
deviceProps.arch.hasSharedInt64Atomics = 1;
deviceProps.arch.hasDoubles = 1;
deviceProps.arch.hasWarpVote = 0;
deviceProps.arch.hasWarpBallot = 0;
deviceProps.arch.hasWarpShuffle = 0;
deviceProps.arch.hasFunnelShift = 0;
deviceProps.arch.hasThreadFenceSystem = 1;
deviceProps.arch.hasSyncThreadsExt = 0;
deviceProps.arch.hasSurfaceFuncs = 0;
deviceProps.arch.has3dGrid = 1;
deviceProps.arch.hasDynamicParallelism = 0;
deviceProps.concurrentKernels = 1;
deviceProps.pciDomainID = info.deviceTopology_.pcie.function;
deviceProps.pciBusID = info.deviceTopology_.pcie.bus;
deviceProps.pciDeviceID = info.deviceTopology_.pcie.device;
deviceProps.maxSharedMemoryPerMultiProcessor = info.localMemSizePerCU_;
//deviceProps.isMultiGpuBoard = info.;
deviceProps.canMapHostMemory = 1;
deviceProps.gcnArch = info.gfxipVersion_;
*props = deviceProps;
return hipSuccess;
}