Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove OCL object from MemoryProperties 8/n

Browse Source 
Refactor MemoryPropertiesFlags to bitfield

Related-To: NEO-3132
Change-Id: I7092b16d15cec962e94c992696bd9845ce86f642
Signed-off-by: Krzysztof Gibala <krzysztof.gibala@intel.com>
This commit is contained in:
Krzysztof Gibala
2019-08-22 12:31:07 +02:00
committed by sys_ocldev
parent 90266b4a37
commit 84c801e28b
8 changed files with 77 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
unit_tests/helpers/memory_properties_flags_helpers_tests.cpp
View File

@ -16,48 +16,48 @@ TEST(MemoryPropertiesFlags, givenValidPropertiesWhenCreateMemoryPropertiesFlagsT
MemoryPropertiesFlags properties;
properties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(CL_MEM_READ_WRITE);
EXPECT_TRUE(properties.readWrite);
EXPECT_TRUE(properties.flags.readWrite);
properties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(CL_MEM_WRITE_ONLY);
EXPECT_TRUE(properties.writeOnly);
EXPECT_TRUE(properties.flags.writeOnly);
properties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(CL_MEM_READ_ONLY);
EXPECT_TRUE(properties.readOnly);
EXPECT_TRUE(properties.flags.readOnly);
properties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(CL_MEM_USE_HOST_PTR);
EXPECT_TRUE(properties.useHostPtr);
EXPECT_TRUE(properties.flags.useHostPtr);
properties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(CL_MEM_ALLOC_HOST_PTR);
EXPECT_TRUE(properties.allocHostPtr);
EXPECT_TRUE(properties.flags.allocHostPtr);
properties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(CL_MEM_COPY_HOST_PTR);
EXPECT_TRUE(properties.copyHostPtr);
EXPECT_TRUE(properties.flags.copyHostPtr);
properties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(CL_MEM_HOST_WRITE_ONLY);
EXPECT_TRUE(properties.hostWriteOnly);
EXPECT_TRUE(properties.flags.hostWriteOnly);
properties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(CL_MEM_HOST_READ_ONLY);
EXPECT_TRUE(properties.hostReadOnly);
EXPECT_TRUE(properties.flags.hostReadOnly);
properties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(CL_MEM_HOST_NO_ACCESS);
EXPECT_TRUE(properties.hostNoAccess);
EXPECT_TRUE(properties.flags.hostNoAccess);
properties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(CL_MEM_KERNEL_READ_AND_WRITE);
EXPECT_TRUE(properties.kernelReadAndWrite);
EXPECT_TRUE(properties.flags.kernelReadAndWrite);
properties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(CL_MEM_ACCESS_FLAGS_UNRESTRICTED_INTEL);
EXPECT_TRUE(properties.accessFlagsUnrestricted);
EXPECT_TRUE(properties.flags.accessFlagsUnrestricted);
properties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(CL_MEM_NO_ACCESS_INTEL);
EXPECT_TRUE(properties.noAccess);
EXPECT_TRUE(properties.flags.noAccess);
MemoryProperties memoryProperties;
memoryProperties.flags_intel = CL_MEM_LOCALLY_UNCACHED_RESOURCE;
properties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(memoryProperties);
EXPECT_TRUE(properties.locallyUncachedResource);
EXPECT_TRUE(properties.flags.locallyUncachedResource);
properties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(CL_MEM_FORCE_SHARED_PHYSICAL_MEMORY_INTEL);
EXPECT_TRUE(properties.forceSharedPhysicalMemory);
EXPECT_TRUE(properties.flags.forceSharedPhysicalMemory);
}
TEST(MemoryPropertiesFlags, givenClMemForceLinearStorageFlagWhenCreateMemoryPropertiesFlagsThenReturnProperValue) {
@ -67,22 +67,22 @@ TEST(MemoryPropertiesFlags, givenClMemForceLinearStorageFlagWhenCreateMemoryProp
memoryProperties.flags |= CL_MEM_FORCE_LINEAR_STORAGE_INTEL;
memoryProperties.flags_intel = 0;
properties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(memoryProperties);
EXPECT_TRUE(properties.forceLinearStorage);
EXPECT_TRUE(properties.flags.forceLinearStorage);
memoryProperties.flags = 0;
memoryProperties.flags_intel |= CL_MEM_FORCE_LINEAR_STORAGE_INTEL;
properties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(memoryProperties);
EXPECT_TRUE(properties.forceLinearStorage);
EXPECT_TRUE(properties.flags.forceLinearStorage);
memoryProperties.flags |= CL_MEM_FORCE_LINEAR_STORAGE_INTEL;
memoryProperties.flags_intel |= CL_MEM_FORCE_LINEAR_STORAGE_INTEL;
properties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(memoryProperties);
EXPECT_TRUE(properties.forceLinearStorage);
EXPECT_TRUE(properties.flags.forceLinearStorage);
memoryProperties.flags = 0;
memoryProperties.flags_intel = 0;
properties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(memoryProperties);
EXPECT_FALSE(properties.forceLinearStorage);
EXPECT_FALSE(properties.flags.forceLinearStorage);
}
TEST(MemoryPropertiesFlags, givenClAllowUnrestrictedSizeFlagWhenCreateMemoryPropertiesFlagsThenReturnProperValue) {
@ -92,20 +92,20 @@ TEST(MemoryPropertiesFlags, givenClAllowUnrestrictedSizeFlagWhenCreateMemoryProp
memoryProperties.flags |= CL_MEM_ALLOW_UNRESTRICTED_SIZE_INTEL;
memoryProperties.flags_intel = 0;
properties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(memoryProperties);
EXPECT_TRUE(properties.allowUnrestrictedSize);
EXPECT_TRUE(properties.flags.allowUnrestrictedSize);
memoryProperties.flags = 0;
memoryProperties.flags_intel |= CL_MEM_ALLOW_UNRESTRICTED_SIZE_INTEL;
properties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(memoryProperties);
EXPECT_TRUE(properties.allowUnrestrictedSize);
EXPECT_TRUE(properties.flags.allowUnrestrictedSize);
memoryProperties.flags |= CL_MEM_ALLOW_UNRESTRICTED_SIZE_INTEL;
memoryProperties.flags_intel |= CL_MEM_ALLOW_UNRESTRICTED_SIZE_INTEL;
properties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(memoryProperties);
EXPECT_TRUE(properties.allowUnrestrictedSize);
EXPECT_TRUE(properties.flags.allowUnrestrictedSize);
memoryProperties.flags = 0;
memoryProperties.flags_intel = 0;
properties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(memoryProperties);
EXPECT_FALSE(properties.allowUnrestrictedSize);
EXPECT_FALSE(properties.flags.allowUnrestrictedSize);
}

8
unit_tests/mem_obj/mem_obj_helper_tests.cpp
View File

@ -34,22 +34,22 @@ TEST(MemObjHelper, givenClMemForceLinearStorageFlagWhenCheckForLinearStorageForc
properties.flags |= CL_MEM_FORCE_LINEAR_STORAGE_INTEL;
properties.flags_intel = 0;
memoryProperties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(properties);
EXPECT_TRUE(memoryProperties.forceLinearStorage);
EXPECT_TRUE(memoryProperties.flags.forceLinearStorage);
properties.flags = 0;
properties.flags_intel |= CL_MEM_FORCE_LINEAR_STORAGE_INTEL;
memoryProperties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(properties);
EXPECT_TRUE(memoryProperties.forceLinearStorage);
EXPECT_TRUE(memoryProperties.flags.forceLinearStorage);
properties.flags |= CL_MEM_FORCE_LINEAR_STORAGE_INTEL;
properties.flags_intel |= CL_MEM_FORCE_LINEAR_STORAGE_INTEL;
memoryProperties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(properties);
EXPECT_TRUE(memoryProperties.forceLinearStorage);
EXPECT_TRUE(memoryProperties.flags.forceLinearStorage);
properties.flags = 0;
properties.flags_intel = 0;
memoryProperties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(properties);
EXPECT_FALSE(memoryProperties.forceLinearStorage);
EXPECT_FALSE(memoryProperties.flags.forceLinearStorage);
}
TEST(MemObjHelper, givenValidPropertiesWhenValidatingMemoryPropertiesThenTrueIsReturned) {