intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-08 14:02:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Built-in kernels refactor"

Browse Source 
This reverts commit 40b00c7e8a.

Change-Id: I8c13be5134c051272db1fe1b7b15764cf8ad6953
This commit is contained in:
Pawel Wilma
2019-07-04 14:02:41 +02:00
committed by sys_ocldev
parent 83396a98cd
commit fac8c94c1e
16 changed files with 48 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unit_tests/built_ins/CMakeLists.txt
View File

@@ -11,5 +11,3 @@ set(IGDRCL_SRCS_tests_built_in
${CMAKE_CURRENT_SOURCE_DIR}/sip_tests.cpp
)
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_built_in})
add_subdirectories()

17
unit_tests/built_ins/built_in_tests.cpp
View File

@@ -691,7 +691,7 @@ TEST_F(BuiltInTests, BuiltinDispatchInfoBuilderReturnTrueIfExplicitKernelArgNotT
TEST_F(BuiltInTests, BuiltinDispatchInfoBuilderGetVMEBuilderReturnNonNull) {
overwriteBuiltInBinaryName(pDevice, "media_kernels_backend");
EBuiltInOps::Type vmeOps[] = {EBuiltInOps::VmeBlockMotionEstimateIntel, EBuiltInOps::VmeBlockAdvancedMotionEstimateCheckIntel, EBuiltInOps::VmeBlockAdvancedMotionEstimateBidirectionalCheckIntel};
EBuiltInOps vmeOps[] = {EBuiltInOps::VmeBlockMotionEstimateIntel, EBuiltInOps::VmeBlockAdvancedMotionEstimateCheckIntel, EBuiltInOps::VmeBlockAdvancedMotionEstimateBidirectionalCheckIntel};
for (auto op : vmeOps) {
BuiltinDispatchInfoBuilder &builder = pBuiltIns->getBuiltinDispatchInfoBuilder(op, *pContext, *pDevice);
EXPECT_NE(nullptr, &builder);
@@ -702,7 +702,7 @@ TEST_F(BuiltInTests, BuiltinDispatchInfoBuilderGetVMEBuilderReturnNonNull) {
TEST_F(BuiltInTests, BuiltinDispatchInfoBuilderVMEBuilderNullKernel) {
overwriteBuiltInBinaryName(pDevice, "media_kernels_backend");
EBuiltInOps::Type vmeOps[] = {EBuiltInOps::VmeBlockMotionEstimateIntel, EBuiltInOps::VmeBlockAdvancedMotionEstimateCheckIntel, EBuiltInOps::VmeBlockAdvancedMotionEstimateBidirectionalCheckIntel};
EBuiltInOps vmeOps[] = {EBuiltInOps::VmeBlockMotionEstimateIntel, EBuiltInOps::VmeBlockAdvancedMotionEstimateCheckIntel, EBuiltInOps::VmeBlockAdvancedMotionEstimateBidirectionalCheckIntel};
for (auto op : vmeOps) {
BuiltinDispatchInfoBuilder &builder = pBuiltIns->getBuiltinDispatchInfoBuilder(op, *pContext, *pDevice);
@@ -789,7 +789,7 @@ TEST_F(BuiltInTests, BuiltinDispatchInfoBuilderAdvancedVMEBuilder) {
auto image = std::unique_ptr<Image>(Image2dHelper<>::create(pContext));
cl_mem srcImageArg = static_cast<cl_mem>(image.get());
EBuiltInOps::Type vmeOps[] = {EBuiltInOps::VmeBlockAdvancedMotionEstimateCheckIntel, EBuiltInOps::VmeBlockAdvancedMotionEstimateBidirectionalCheckIntel};
EBuiltInOps vmeOps[] = {EBuiltInOps::VmeBlockAdvancedMotionEstimateCheckIntel, EBuiltInOps::VmeBlockAdvancedMotionEstimateBidirectionalCheckIntel};
for (auto op : vmeOps) {
MultiDispatchInfo outMdi;
overwriteBuiltInBinaryName(pDevice, "media_kernels_backend");
@@ -851,11 +851,6 @@ TEST_F(BuiltInTests, getBuiltinAsString) {
EXPECT_EQ(0, strcmp("unknown", getBuiltinAsString(EBuiltInOps::COUNT)));
}
TEST_F(BuiltInTests, WhenUnknownOperationIsSpecifiedThenUnknownNameIsReturned) {
EXPECT_EQ(0, strcmp("unknown", getUnknownBuiltinAsString(EBuiltInOps::CopyImage3dToBuffer)));
EXPECT_EQ(0, strcmp("unknown", getUnknownBuiltinAsString(EBuiltInOps::COUNT)));
}
TEST_F(BuiltInTests, getExtension) {
EXPECT_EQ(0, strcmp("", BuiltinCode::getExtension(BuiltinCode::ECodeType::Any)));
EXPECT_EQ(0, strcmp(".bin", BuiltinCode::getExtension(BuiltinCode::ECodeType::Binary)));
@@ -877,7 +872,7 @@ TEST_F(BuiltInTests, createBuiltinResource) {
}
TEST_F(BuiltInTests, createBuiltinResourceName) {
EBuiltInOps::Type builtin = EBuiltInOps::CopyBufferToBuffer;
EBuiltInOps builtin = EBuiltInOps::CopyBufferToBuffer;
const std::string extension = ".cl";
const std::string platformName = "skl";
const uint32_t deviceRevId = 9;
@@ -1022,7 +1017,7 @@ TEST_F(BuiltInTests, getBuiltinCodeForTypeInvalid) {
TEST_F(BuiltInTests, getBuiltinResourcesForTypeSource) {
class MockBuiltinsLib : BuiltinsLib {
public:
BuiltinResourceT getBuiltinResource(EBuiltInOps::Type builtin, BuiltinCode::ECodeType requestedCodeType, Device &device) {
BuiltinResourceT getBuiltinResource(EBuiltInOps builtin, BuiltinCode::ECodeType requestedCodeType, Device &device) {
return BuiltinsLib::getBuiltinResource(builtin, requestedCodeType, device);
}
};
@@ -1049,7 +1044,7 @@ TEST_F(BuiltInTests, getBuiltinResourcesForTypeSource) {
TEST_F(BuiltInTests, getBuiltinResourcesForTypeBinary) {
class MockBuiltinsLib : BuiltinsLib {
public:
BuiltinResourceT getBuiltinResource(EBuiltInOps::Type builtin, BuiltinCode::ECodeType requestedCodeType, Device &device) {
BuiltinResourceT getBuiltinResource(EBuiltInOps builtin, BuiltinCode::ECodeType requestedCodeType, Device &device) {
return BuiltinsLib::getBuiltinResource(builtin, requestedCodeType, device);
}
};

2
unit_tests/command_queue/enqueue_read_image_tests.cpp
View File

@@ -240,7 +240,7 @@ HWTEST_F(EnqueueReadImageTest, GivenImage1DarrayWhenReadImageIsCalledThenHostPtr
HWTEST_F(EnqueueReadImageTest, GivenImage1DarrayWhenReadImageIsCalledThenRowPitchIsSetToSlicePitch) {
auto &builtIns = *pCmdQ->getDevice().getExecutionEnvironment()->getBuiltIns();
EBuiltInOps::Type copyBuiltIn = EBuiltInOps::CopyImage3dToBuffer;
EBuiltInOps copyBuiltIn = EBuiltInOps::CopyImage3dToBuffer;
auto &origBuilder = builtIns.getBuiltinDispatchInfoBuilder(
copyBuiltIn,
pCmdQ->getContext(),

2
unit_tests/command_queue/enqueue_write_image_tests.cpp
View File

@@ -218,7 +218,7 @@ HWTEST_F(EnqueueWriteImageTest, GivenImage1DarrayWhenReadWriteImageIsCalledThenH
HWTEST_F(EnqueueWriteImageTest, GivenImage1DarrayWhenWriteImageIsCalledThenRowPitchIsSetToSlicePitch) {
auto &builtIns = *pCmdQ->getDevice().getExecutionEnvironment()->getBuiltIns();
EBuiltInOps::Type copyBuiltIn = EBuiltInOps::CopyBufferToImage3d;
EBuiltInOps copyBuiltIn = EBuiltInOps::CopyBufferToImage3d;
auto &origBuilder = builtIns.getBuiltinDispatchInfoBuilder(
copyBuiltIn,
pCmdQ->getContext(),