Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify code. 

Change-Id: If730d02312da01515ae53b5faaeb5d33419ec4ba
Signed-off-by: Piotr Fusik <piotr.fusik@intel.com>
This commit is contained in:
Piotr Fusik 2019-02-28 11:21:01 +01:00 committed by sys_ocldev
parent 295d45f5ef
commit 33a9d3160b
9 changed files with 53 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/helpers/cache_policy.cpp
View File

@ -13,11 +13,8 @@
namespace OCLRT {
bool isL3Capable(void *ptr, size_t size) {
if (alignUp(ptr, MemoryConstants::cacheLineSize) == ptr &&
alignUp(size, MemoryConstants::cacheLineSize) == size) {
return true;
}
return false;
return isAligned<MemoryConstants::cacheLineSize>(ptr) &&
isAligned<MemoryConstants::cacheLineSize>(size);
}
bool isL3Capable(const OCLRT::GraphicsAllocation &graphicsAllocation) {

5
runtime/kernel/kernel.cpp
View File

@ -2196,10 +2196,7 @@ void Kernel::getAllocationsForCacheFlush(CacheFlushAllocationsVec &out) const {
}
bool Kernel::allocationForCacheFlush(GraphicsAllocation *argAllocation) const {
if (argAllocation->flushL3Required || argAllocation->isMemObjectsAllocationWithWritableFlags()) {
return true;
}
return false;
return argAllocation->flushL3Required || argAllocation->isMemObjectsAllocationWithWritableFlags();
}
void Kernel::addAllocationToCacheFlushVector(uint32_t argIndex, GraphicsAllocation *argAllocation) {

5
runtime/mem_obj/buffer.cpp
View File

@ -353,10 +353,7 @@ GraphicsAllocation::AllocationType Buffer::getGraphicsAllocationType(const Memor
bool Buffer::isReadOnlyMemoryPermittedByFlags(cl_mem_flags flags) {
// Host won't access or will only read and kernel will only read
if ((flags & (CL_MEM_HOST_NO_ACCESS | CL_MEM_HOST_READ_ONLY)) && (flags & CL_MEM_READ_ONLY)) {
return true;
}
return false;
return (flags & (CL_MEM_HOST_NO_ACCESS | CL_MEM_HOST_READ_ONLY)) && (flags & CL_MEM_READ_ONLY);
}
Buffer *Buffer::createSubBuffer(cl_mem_flags flags,

9
runtime/mem_obj/image.cpp
View File

@ -989,18 +989,15 @@ const SurfaceFormatInfo *Image::getSurfaceFormatFromTable(cl_mem_flags flags, co
}
bool Image::isImage2d(cl_mem_object_type imageType) {
return (imageType == CL_MEM_OBJECT_IMAGE2D);
return imageType == CL_MEM_OBJECT_IMAGE2D;
}
bool Image::isImage2dOr2dArray(cl_mem_object_type imageType) {
return (imageType == CL_MEM_OBJECT_IMAGE2D) || (imageType == CL_MEM_OBJECT_IMAGE2D_ARRAY);
return imageType == CL_MEM_OBJECT_IMAGE2D || imageType == CL_MEM_OBJECT_IMAGE2D_ARRAY;
}
bool Image::isDepthFormat(const cl_image_format &imageFormat) {
if (imageFormat.image_channel_order == CL_DEPTH || imageFormat.image_channel_order == CL_DEPTH_STENCIL) {
return true;
}
return false;
return imageFormat.image_channel_order == CL_DEPTH || imageFormat.image_channel_order == CL_DEPTH_STENCIL;
}
Image *Image::validateAndCreateImage(Context *context,

10
runtime/memory_manager/memory_pool.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2018 Intel Corporation
* Copyright (C) 2018-2019 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -21,9 +21,9 @@ constexpr Type System64KBPagesWith32BitGpuAddressing{4};
constexpr Type SystemCpuInaccessible{5};
inline bool isSystemMemoryPool(Type pool) {
if (pool == System4KBPages || pool == MemoryPool::System64KBPages || pool == System4KBPagesWith32BitGpuAddressing || pool == System64KBPagesWith32BitGpuAddressing) {
return true;
}
return false;
return pool == System4KBPages ||
pool == System64KBPages ||
pool == System4KBPagesWith32BitGpuAddressing ||
pool == System64KBPagesWith32BitGpuAddressing;
}
} // namespace MemoryPool

50
runtime/os_interface/debug_settings_manager.cpp
View File

@ -245,7 +245,7 @@ void DebugSettingsManager<DebugLevel>::dumpKernelArgs(const MultiDispatchInfo *m
return;
}
if ((flags.DumpKernelArgs.get() == false) || (multiDispatchInfo == nullptr)) {
if (flags.DumpKernelArgs.get() == false || multiDispatchInfo == nullptr) {
return;
}
@ -274,55 +274,55 @@ const char *DebugSettingsManager<DebugLevel>::getAllocationTypeString(GraphicsAl
auto type = graphicsAllocation->getAllocationType();
switch (type) {
case OCLRT::GraphicsAllocation::AllocationType::UNKNOWN:
case GraphicsAllocation::AllocationType::UNKNOWN:
return "UNKNOWN";
case OCLRT::GraphicsAllocation::AllocationType::BUFFER_COMPRESSED:
case GraphicsAllocation::AllocationType::BUFFER_COMPRESSED:
return "BUFFER_COMPRESSED";
case OCLRT::GraphicsAllocation::AllocationType::BUFFER_HOST_MEMORY:
case GraphicsAllocation::AllocationType::BUFFER_HOST_MEMORY:
return "BUFFER_HOST_MEMORY";
case OCLRT::GraphicsAllocation::AllocationType::BUFFER:
case GraphicsAllocation::AllocationType::BUFFER:
return "BUFFER";
case OCLRT::GraphicsAllocation::AllocationType::IMAGE:
case GraphicsAllocation::AllocationType::IMAGE:
return "IMAGE";
case OCLRT::GraphicsAllocation::AllocationType::TAG_BUFFER:
case GraphicsAllocation::AllocationType::TAG_BUFFER:
return "TAG_BUFFER";
case OCLRT::GraphicsAllocation::AllocationType::LINEAR_STREAM:
case GraphicsAllocation::AllocationType::LINEAR_STREAM:
return "LINEAR_STREAM";
case OCLRT::GraphicsAllocation::AllocationType::FILL_PATTERN:
case GraphicsAllocation::AllocationType::FILL_PATTERN:
return "FILL_PATTERN";
case OCLRT::GraphicsAllocation::AllocationType::PIPE:
case GraphicsAllocation::AllocationType::PIPE:
return "PIPE";
case OCLRT::GraphicsAllocation::AllocationType::TIMESTAMP_PACKET_TAG_BUFFER:
case GraphicsAllocation::AllocationType::TIMESTAMP_PACKET_TAG_BUFFER:
return "TIMESTAMP_PACKET_TAG_BUFFER";
case OCLRT::GraphicsAllocation::AllocationType::PROFILING_TAG_BUFFER:
case GraphicsAllocation::AllocationType::PROFILING_TAG_BUFFER:
return "PROFILING_TAG_BUFFER";
case OCLRT::GraphicsAllocation::AllocationType::COMMAND_BUFFER:
case GraphicsAllocation::AllocationType::COMMAND_BUFFER:
return "COMMAND_BUFFER";
case OCLRT::GraphicsAllocation::AllocationType::PRINTF_SURFACE:
case GraphicsAllocation::AllocationType::PRINTF_SURFACE:
return "PRINTF_SURFACE";
case OCLRT::GraphicsAllocation::AllocationType::GLOBAL_SURFACE:
case GraphicsAllocation::AllocationType::GLOBAL_SURFACE:
return "GLOBAL_SURFACE";
case OCLRT::GraphicsAllocation::AllocationType::PRIVATE_SURFACE:
case GraphicsAllocation::AllocationType::PRIVATE_SURFACE:
return "PRIVATE_SURFACE";
case OCLRT::GraphicsAllocation::AllocationType::CONSTANT_SURFACE:
case GraphicsAllocation::AllocationType::CONSTANT_SURFACE:
return "CONSTANT_SURFACE";
case OCLRT::GraphicsAllocation::AllocationType::SCRATCH_SURFACE:
case GraphicsAllocation::AllocationType::SCRATCH_SURFACE:
return "SCRATCH_SURFACE";
case OCLRT::GraphicsAllocation::AllocationType::INSTRUCTION_HEAP:
case GraphicsAllocation::AllocationType::INSTRUCTION_HEAP:
return "INSTRUCTION_HEAP";
case OCLRT::GraphicsAllocation::AllocationType::INDIRECT_OBJECT_HEAP:
case GraphicsAllocation::AllocationType::INDIRECT_OBJECT_HEAP:
return "INDIRECT_OBJECT_HEAP";
case OCLRT::GraphicsAllocation::AllocationType::SURFACE_STATE_HEAP:
case GraphicsAllocation::AllocationType::SURFACE_STATE_HEAP:
return "SURFACE_STATE_HEAP";
case OCLRT::GraphicsAllocation::AllocationType::DYNAMIC_STATE_HEAP:
case GraphicsAllocation::AllocationType::DYNAMIC_STATE_HEAP:
return "DYNAMIC_STATE_HEAP";
case OCLRT::GraphicsAllocation::AllocationType::SHARED_RESOURCE_COPY:
case GraphicsAllocation::AllocationType::SHARED_RESOURCE_COPY:
return "SHARED_RESOURCE_COPY";
case OCLRT::GraphicsAllocation::AllocationType::SVM:
case GraphicsAllocation::AllocationType::SVM:
return "SVM";
case GraphicsAllocation::AllocationType::EXTERNAL_HOST_PTR:
return "EXTERNAL_HOST_PTR";
case OCLRT::GraphicsAllocation::AllocationType::UNDECIDED:
case GraphicsAllocation::AllocationType::UNDECIDED:
return "UNDECIDED";
default:
return "ILLEGAL_VALUE";

5
runtime/os_interface/windows/wddm_residency_controller.cpp
View File

@ -134,10 +134,7 @@ void WddmResidencyController::checkTrimCandidateCount() {
}
bool WddmResidencyController::checkTrimCandidateListCompaction() {
if (2 * trimCandidatesCount <= trimCandidateList.size()) {
return true;
}
return false;
return 2 * trimCandidatesCount <= trimCandidateList.size();
}
void WddmResidencyController::compactTrimCandidateList() {

5
unit_tests/perf_tests/perf_test_utils.cpp
View File

@ -101,10 +101,7 @@ bool isInRange(double data, double reference, double multiplier) {
double lower = reference / multiplier;
double higher = reference * multiplier;
if ((data >= lower) && (data <= higher)) {
return true;
}
return false;
return data >= lower && data <= higher;
}
bool isLowerThanReference(double data, double reference, double multiplier) {

36
unit_tests/sharings/va/va_sharing_linux_tests.cpp
View File

@ -19,30 +19,22 @@ class VASharingFunctionsTested : public VASharingFunctions {
public:
VASharingFunctionsTested() : VASharingFunctions(nullptr) {}
bool wereFunctionsAssigned() {
if (
vaDisplayIsValidPFN != nullptr &&
vaDeriveImagePFN != nullptr &&
vaDestroyImagePFN != nullptr &&
vaSyncSurfacePFN != nullptr &&
vaGetLibFuncPFN != nullptr &&
vaExtGetSurfaceHandlePFN != nullptr) {
return true;
}
return false;
bool wereFunctionsAssigned() const {
return vaDisplayIsValidPFN != nullptr &&
vaDeriveImagePFN != nullptr &&
vaDestroyImagePFN != nullptr &&
vaSyncSurfacePFN != nullptr &&
vaGetLibFuncPFN != nullptr &&
vaExtGetSurfaceHandlePFN != nullptr;
}
bool wereFunctionsAssignedNull() {
if (
vaDisplayIsValidPFN == nullptr &&
vaDeriveImagePFN == nullptr &&
vaDestroyImagePFN == nullptr &&
vaSyncSurfacePFN == nullptr &&
vaGetLibFuncPFN == nullptr &&
vaExtGetSurfaceHandlePFN == nullptr) {
return true;
}
return false;
bool wereFunctionsAssignedNull() const {
return vaDisplayIsValidPFN == nullptr &&
vaDeriveImagePFN == nullptr &&
vaDestroyImagePFN == nullptr &&
vaSyncSurfacePFN == nullptr &&
vaGetLibFuncPFN == nullptr &&
vaExtGetSurfaceHandlePFN == nullptr;
}
};