ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-25 16:29:03 +00:00
Code Packages Projects Releases Wiki Activity

Reduce diff with master

Browse Source 
Whitespace, typos and simple build system/script changes.

Signed-off-by: Kevin Petit <kevin.petit@arm.com>
This commit is contained in:
Kevin Petit
2019-07-31 11:32:39 +01:00
committed by Kévin Petit
parent be2ca84c42
commit e535e0aa21
4 changed files with 42 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
CMakeLists.txt
View File

@@ -1,7 +1,6 @@
cmake_minimum_required(VERSION 3.1) cmake_minimum_required(VERSION 3.1)
set( CONFORMANCE_SUFFIX "" ) set( CONFORMANCE_SUFFIX "" )
set(CLConform_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(CLConform_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
project(CLConform${CONFORMANCE_SUFFIX}) project(CLConform${CONFORMANCE_SUFFIX})
@@ -25,6 +24,7 @@ add_definitions(-DCL_TARGET_OPENCL_VERSION=200)
add_definitions(-DCL_USE_DEPRECATED_OPENCL_2_0_APIS=1) add_definitions(-DCL_USE_DEPRECATED_OPENCL_2_0_APIS=1)
add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_2_APIS=1) add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_2_APIS=1)
add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_1_APIS=1) add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_1_APIS=1)
add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_0_APIS=1)
# Support both VS2008 and VS2012. # Support both VS2008 and VS2012.
@@ -67,22 +67,17 @@ if(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?Clang"
# to falsely fail. -ffloat-store also works, but WG suggested # to falsely fail. -ffloat-store also works, but WG suggested
# that sse would be better. # that sse would be better.
if(CMAKE_ARM_COMPILER OR ANDROID) if(CMAKE_ARM_COMPILER OR ANDROID)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -std=gnu99") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -std=gnu99 -Wno-narrowing")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -std=gnu++11 -Wno-narrowing")
else(CMAKE_ARM_COMPILER OR ANDROID) else(CMAKE_ARM_COMPILER OR ANDROID)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -std=gnu99 -msse -mfpmath=sse") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -std=gnu99 -msse -mfpmath=sse -Wno-narrowing")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -msse -mfpmath=sse") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -msse -mfpmath=sse -std=gnu++11 -Wno-narrowing")
endif(CMAKE_ARM_COMPILER OR ANDROID) endif(CMAKE_ARM_COMPILER OR ANDROID)
else() else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D__SSE__") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D__SSE__")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D__SSE__") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D__SSE__")
endif() endif()
# Clang gives C++11 narrowing warnings so suppress these for now
if("${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++11-narrowing")
endif()
if( WIN32 AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel" ) if( WIN32 AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel" )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qlong-double -Qpc80 /DWIN32 /D_WINDOWS /W3 /GR /EHsc -nologo -Od -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -EHsc -Wall -Qdiag-disable:68,111,177,186,161,869,1028,2259,2553,181,239,265,1188 -fp:strict -fp:source") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qlong-double -Qpc80 /DWIN32 /D_WINDOWS /W3 /GR /EHsc -nologo -Od -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -EHsc -Wall -Qdiag-disable:68,111,177,186,161,869,1028,2259,2553,181,239,265,1188 -fp:strict -fp:source")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Qlong-double -Qpc80 /DWIN32 /D_WINDOWS /W3 /GR /EHsc -nologo -Od -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -EHsc -Wall -Qdiag-disable:68,111,177,186,161,869,1028,2259,2553,181,239,265,1188 -fp:strict -fp:source") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Qlong-double -Qpc80 /DWIN32 /D_WINDOWS /W3 /GR /EHsc -nologo -Od -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -EHsc -Wall -Qdiag-disable:68,111,177,186,161,869,1028,2259,2553,181,239,265,1188 -fp:strict -fp:source")
@@ -91,6 +86,8 @@ endif()
list(APPEND CLConform_LIBRARIES ${OPENCL_LIBRARIES}) list(APPEND CLConform_LIBRARIES ${OPENCL_LIBRARIES})
if(ANDROID) if(ANDROID)
list(APPEND CLConform_LIBRARIES m) list(APPEND CLConform_LIBRARIES m)
elseif(NOT WIN32)
list(APPEND CLConform_LIBRARIES pthread)
endif(ANDROID) endif(ANDROID)
if(APPLE) if(APPLE)
@@ -100,14 +97,11 @@ if(APPLE)
list(APPEND CLConform_LIBRARIES ${iokit}) list(APPEND CLConform_LIBRARIES ${iokit})
endif(APPLE) endif(APPLE)
list(APPEND CLConform_INCLUDE_DIR ${OPENCL_INCLUDE_DIR}) include_directories(SYSTEM ${OPENCL_INCLUDE_DIR})
include_directories(${CLConform_SOURCE_DIR}/test_common/harness
include_directories (${CLConform_SOURCE_DIR}/test_common/harness
${CLConform_SOURCE_DIR}/test_common/gles ${CLConform_SOURCE_DIR}/test_common/gles
${CLConform_SOURCE_DIR}/test_common/gl ${CLConform_SOURCE_DIR}/test_common/gl
${CLConform_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/test_common/harness)
${CMAKE_CURRENT_SOURCE_DIR}/test_common/harness
)
if(CMAKE_BUILD_TYPE STREQUAL "release") if(CMAKE_BUILD_TYPE STREQUAL "release")
set (BUILD_FLAVOR "release") set (BUILD_FLAVOR "release")
@@ -125,13 +119,13 @@ set (DLL_FILES "${VS_BUILD_DIR}/Debug/*.dll")
set (DST_DIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Debug/") set (DST_DIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Debug/")
if (WIN32) if (WIN32)
set (COPY "echo") set (COPY "echo")
add_custom_target( COPY_DLL${CONFORMANCE_SUFFIX} ALL add_custom_target(COPY_DLL${CONFORMANCE_SUFFIX} ALL
COMMAND ${COPY} \"${DLL_FILES}\" \"${DST_DIR}\" COMMAND ${COPY} "${DLL_FILES}" "${DST_DIR}"
COMMENT "Copying dll files.. ") COMMENT "Copying dll files.. ")
else (WIN32) else (WIN32)
set (COPY cp) set (COPY cp)
add_custom_target( COPY_DLL${CONFORMANCE_SUFFIX} ) add_custom_target(COPY_DLL${CONFORMANCE_SUFFIX})
endif(WIN32) endif(WIN32)
set_property(TARGET COPY_DLL${CONFORMANCE_SUFFIX} PROPERTY FOLDER "CONFORMANCE${CONFORMANCE_SUFFIX}") set_property(TARGET COPY_DLL${CONFORMANCE_SUFFIX} PROPERTY FOLDER "CONFORMANCE${CONFORMANCE_SUFFIX}")

3
test_conformance/CMakeCommon.txt
View File

@@ -1,5 +1,4 @@
set_source_files_properties( set_source_files_properties(COMPILE_FLAGS -msse2)
COMPILE_FLAGS -msse2)
string(TOLOWER ${MODULE_NAME} MODULE_NAME_LOWER) string(TOLOWER ${MODULE_NAME} MODULE_NAME_LOWER)

2
test_conformance/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
# Remember curren source directory (`test_conformance'). # Remember current source directory (`test_conformance').
set( CLConf_Install_Base_Dir "${CMAKE_CURRENT_SOURCE_DIR}" ) set( CLConf_Install_Base_Dir "${CMAKE_CURRENT_SOURCE_DIR}" )
add_subdirectory( allocations ) add_subdirectory( allocations )

4
test_conformance/run_conformance.py
View File

@@ -52,7 +52,7 @@ def get_tests(filename, devices_to_test):
comment = re.search("^#.*", line) comment = re.search("^#.*", line)
if (comment): if (comment):
continue continue
device_specific_match = re.search("^\s*(.+)\s*,\s*(.+)\s*,\s*(.+)\s*", line) device_specific_match = re.search("^\s*(.+?)\s*,\s*(.+?)\s*,\s*(.+?)\s*$", line)
if (device_specific_match): if (device_specific_match):
if (device_specific_match.group(1) in devices_to_test): if (device_specific_match.group(1) in devices_to_test):
test_path = string.replace(device_specific_match.group(3), '/', os.sep) test_path = string.replace(device_specific_match.group(3), '/', os.sep)
@@ -61,7 +61,7 @@ def get_tests(filename, devices_to_test):
else: else:
print("Skipping " + device_specific_match.group(2) + " because " + device_specific_match.group(1) + " is not in the list of devices to test.") print("Skipping " + device_specific_match.group(2) + " because " + device_specific_match.group(1) + " is not in the list of devices to test.")
continue continue
match = re.search("^\s*(.+)\s*,\s*(.+)\s*", line) match = re.search("^\s*(.+?)\s*,\s*(.+?)\s*$", line)
if (match): if (match):
test_path = string.replace(match.group(2), '/', os.sep) test_path = string.replace(match.group(2), '/', os.sep)
test_name = string.replace(match.group(1), '/', os.sep) test_name = string.replace(match.group(1), '/', os.sep)