Move few files from GTPIN to GENX directories

- This fixes issue with difference in shared code
- Also renames variable in ULT

Change-Id: Icedfc26ee4b0fdde80ab88445cbbee3a4bbc379e
This commit is contained in:
hjnapiat
2018-01-10 09:36:06 +01:00
committed by sys_ocldev
parent c8d9846d50
commit 9564c5c2c1
5 changed files with 6 additions and 6 deletions

View File

@@ -815,7 +815,7 @@ if(${GENERATE_EXECUTABLE})
foreach(GEN_NUM RANGE ${MAX_GEN} 0 -1)
GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_NUM} GENX_HAS_PLATFORMS)
if(${GENX_HAS_PLATFORMS})
list(APPEND RUNTIME_SRCS_GTPIN gtpin/gtpin_setup_gen${GEN_NUM}.cpp)
list(APPEND RUNTIME_SRCS_GTPIN gen${GEN_NUM}/gtpin_setup_gen${GEN_NUM}.cpp)
endif(${GENX_HAS_PLATFORMS})
endforeach(GEN_NUM)
endif(GTPIN_HEADERS_DIR)

View File

@@ -183,7 +183,7 @@ if(GTPIN_HEADERS_DIR)
foreach(GEN_NUM RANGE ${MAX_GEN} 0 -1)
GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_NUM} GENX_HAS_PLATFORMS)
if(${GENX_HAS_PLATFORMS})
list(APPEND IGDRCL_SRCS_tests ${IGDRCL_SOURCE_DIR}/runtime/gtpin/gtpin_setup_gen${GEN_NUM}.cpp)
list(APPEND IGDRCL_SRCS_tests ${IGDRCL_SOURCE_DIR}/runtime/gen${GEN_NUM}/gtpin_setup_gen${GEN_NUM}.cpp)
endif(${GENX_HAS_PLATFORMS})
endforeach(GEN_NUM)
endif(GTPIN_HEADERS_DIR)

View File

@@ -502,14 +502,14 @@ TEST_F(GTPinTests, givenInitializedGTPinInterfaceWhenContextCreationArgumentsAre
int prevCount = ContextCreateCallbackCount;
cl_device_id device = (cl_device_id)pDevice;
cl_context_properties invalidProperties[3] = {CL_CONTEXT_PLATFORM, (cl_context_properties) nullptr, 0};
auto contextZ = clCreateContext(invalidProperties, 1, &device, nullptr, nullptr, &retVal);
auto context = clCreateContext(invalidProperties, 1, &device, nullptr, nullptr, &retVal);
EXPECT_EQ(CL_INVALID_PLATFORM, retVal);
EXPECT_EQ(nullptr, contextZ);
EXPECT_EQ(nullptr, context);
EXPECT_EQ(ContextCreateCallbackCount, prevCount);
contextZ = clCreateContextFromType(invalidProperties, CL_DEVICE_TYPE_GPU, nullptr, nullptr, &retVal);
context = clCreateContextFromType(invalidProperties, CL_DEVICE_TYPE_GPU, nullptr, nullptr, &retVal);
EXPECT_EQ(CL_INVALID_PLATFORM, retVal);
EXPECT_EQ(nullptr, contextZ);
EXPECT_EQ(nullptr, context);
EXPECT_EQ(ContextCreateCallbackCount, prevCount);
}