diff --git a/test_common/harness/crc32.c b/test_common/harness/crc32.c new file mode 100644 index 00000000..a34be300 --- /dev/null +++ b/test_common/harness/crc32.c @@ -0,0 +1,104 @@ +/*- + * COPYRIGHT (C) 1986 Gary S. Brown. You may use this program, or + * code or tables extracted from it, as desired without restriction. + * + * First, the polynomial itself and its table of feedback terms. The + * polynomial is + * X^32+X^26+X^23+X^22+X^16+X^12+X^11+X^10+X^8+X^7+X^5+X^4+X^2+X^1+X^0 + * + * Note that we take it "backwards" and put the highest-order term in + * the lowest-order bit. The X^32 term is "implied"; the LSB is the + * X^31 term, etc. The X^0 term (usually shown as "+1") results in + * the MSB being 1 + * + * Note that the usual hardware shift register implementation, which + * is what we're using (we're merely optimizing it by doing eight-bit + * chunks at a time) shifts bits into the lowest-order term. In our + * implementation, that means shifting towards the right. Why do we + * do it this way? Because the calculated CRC must be transmitted in + * order from highest-order term to lowest-order term. UARTs transmit + * characters in order from LSB to MSB. By storing the CRC this way + * we hand it to the UART in the order low-byte to high-byte; the UART + * sends each low-bit to hight-bit; and the result is transmission bit + * by bit from highest- to lowest-order term without requiring any bit + * shuffling on our part. Reception works similarly + * + * The feedback terms table consists of 256, 32-bit entries. Notes + * + * The table can be generated at runtime if desired; code to do so + * is shown later. It might not be obvious, but the feedback + * terms simply represent the results of eight shift/xor opera + * tions for all combinations of data and CRC register values + * + * The values must be right-shifted by eight bits by the "updcrc + * logic; the shift must be unsigned (bring in zeroes). On some + * hardware you could probably optimize the shift in assembler by + * using byte-swap instructions + * polynomial $edb88320 + * + * + * CRC32 code derived from work by Gary S. Brown. + */ + +#include "crc32.h" + +static uint32_t crc32_tab[] = { + 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, + 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, + 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, + 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, + 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, + 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, + 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, + 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, + 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, + 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, + 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, + 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, + 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, + 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, + 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, + 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, + 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, + 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, + 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, + 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, + 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, + 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, + 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, + 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, + 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, + 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, + 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, + 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, + 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, + 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, + 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, + 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, + 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, + 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, + 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, + 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, + 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, + 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, + 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, + 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, + 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, + 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, + 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d +}; + +uint32_t +crc32(const void *buf, size_t size) +{ + const uint8_t *p; + + p = (const uint8_t*)buf; + uint32_t crc = ~0U; + + while (size--) + crc = crc32_tab[(crc ^ *p++) & 0xFF] ^ (crc >> 8); + + return crc ^ ~0U; +} + diff --git a/test_common/harness/crc32.h b/test_common/harness/crc32.h new file mode 100644 index 00000000..745ba90e --- /dev/null +++ b/test_common/harness/crc32.h @@ -0,0 +1,34 @@ +/****************************************************************** +Copyright (c) 2016 The Khronos Group Inc. +All Rights Reserved. This code is protected by copyright laws and +contains material proprietary to the Khronos Group, Inc. +This is UNPUBLISHED PROPRIETARY SOURCE CODE that may not be disclosed +in whole or in part to third parties, and may not be reproduced, republished, +distributed, transmitted, displayed, broadcast or otherwise exploited in any +manner without the express prior written permission of Khronos Group. + +The receipt or possession of this code does not convey any rights to +reproduce, disclose, or distribute its contents, or to +manufacture, use, or sell anything that it may describe, in whole +or in part other than under the terms of the Khronos Adopters +Agreement or Khronos Conformance Test Source License Agreement as +executed between Khronos and the recipient. +******************************************************************/ + +#ifndef _CRC32_H_ +#define _CRC32_H_ + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +uint32_t crc32(const void *buf, size_t size); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/test_common/harness/kernelHelpers.c b/test_common/harness/kernelHelpers.c index 0bd49fc8..1f3f67a9 100644 --- a/test_common/harness/kernelHelpers.c +++ b/test_common/harness/kernelHelpers.c @@ -13,6 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // +#include "crc32.h" #include "kernelHelpers.h" #include "errorHelpers.h" #include "imageHelpers.h" @@ -74,17 +75,8 @@ std::vector get_file_content(const std::string &fileName) std::string get_kernel_name(const std::string &source) { - cl_uint crc = 0; - // Count CRC - for (cl_uint i = 0; i < source.size() - source.size() % sizeof(cl_uint); i += sizeof(cl_uint)) - { - cl_uint *ptr = (cl_uint *)&source[i]; - crc += *ptr; - } - cl_uint remainder = 0; - memcpy(&remainder, &source[0] + source.size() - source.size() % sizeof(cl_uint), source.size() % sizeof(cl_uint)); - crc += remainder; + cl_uint crc = crc32(source.data(), source.size()); // Create list of kernel names std::string kernelsList; diff --git a/test_conformance/SVM/CMakeLists.txt b/test_conformance/SVM/CMakeLists.txt index ad74a829..4077c417 100644 --- a/test_conformance/SVM/CMakeLists.txt +++ b/test_conformance/SVM/CMakeLists.txt @@ -22,6 +22,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/mt19937.c ../../test_common/harness/msvc9.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/allocations/CMakeLists.txt b/test_conformance/allocations/CMakeLists.txt index a42288b4..07da26b0 100644 --- a/test_conformance/allocations/CMakeLists.txt +++ b/test_conformance/allocations/CMakeLists.txt @@ -14,6 +14,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/mt19937.c ../../test_common/harness/msvc9.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/api/CMakeLists.txt b/test_conformance/api/CMakeLists.txt index bf3a126b..69f94cab 100644 --- a/test_conformance/api/CMakeLists.txt +++ b/test_conformance/api/CMakeLists.txt @@ -34,6 +34,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/msvc9.c ../../test_common/harness/imageHelpers.cpp ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/atomics/CMakeLists.txt b/test_conformance/atomics/CMakeLists.txt index 9dcd4bb1..5d9e8827 100644 --- a/test_conformance/atomics/CMakeLists.txt +++ b/test_conformance/atomics/CMakeLists.txt @@ -12,6 +12,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/conversions.c ../../test_common/harness/msvc9.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/basic/CMakeLists.txt b/test_conformance/basic/CMakeLists.txt index aebf470a..e390bb9b 100644 --- a/test_conformance/basic/CMakeLists.txt +++ b/test_conformance/basic/CMakeLists.txt @@ -74,6 +74,7 @@ set(${MODULE_NAME}_SOURCES test_local_linear_id.c test_progvar.cpp ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) if(APPLE) diff --git a/test_conformance/buffers/CMakeLists.txt b/test_conformance/buffers/CMakeLists.txt index 8265eca5..8e699e67 100644 --- a/test_conformance/buffers/CMakeLists.txt +++ b/test_conformance/buffers/CMakeLists.txt @@ -21,6 +21,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/conversions.c ../../test_common/harness/msvc9.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/c11_atomics/CMakeLists.txt b/test_conformance/c11_atomics/CMakeLists.txt index 96525406..e0b77ef5 100644 --- a/test_conformance/c11_atomics/CMakeLists.txt +++ b/test_conformance/c11_atomics/CMakeLists.txt @@ -12,6 +12,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/mt19937.c ../../test_common/harness/msvc9.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/commonfns/CMakeLists.txt b/test_conformance/commonfns/CMakeLists.txt index 677bca15..50aef6c5 100644 --- a/test_conformance/commonfns/CMakeLists.txt +++ b/test_conformance/commonfns/CMakeLists.txt @@ -28,6 +28,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/conversions.c ../../test_common/harness/msvc9.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/compiler/CMakeLists.txt b/test_conformance/compiler/CMakeLists.txt index 861ae083..422c5c5c 100644 --- a/test_conformance/compiler/CMakeLists.txt +++ b/test_conformance/compiler/CMakeLists.txt @@ -20,6 +20,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/msvc9.c ../../test_common/harness/os_helpers.cpp ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/computeinfo/CMakeLists.txt b/test_conformance/computeinfo/CMakeLists.txt index 2bf1a7f2..266ab6d6 100644 --- a/test_conformance/computeinfo/CMakeLists.txt +++ b/test_conformance/computeinfo/CMakeLists.txt @@ -7,6 +7,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/kernelHelpers.c ../../test_common/harness/parseParameters.cpp ../../test_common/harness/testHarness.c + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/contractions/CMakeLists.txt b/test_conformance/contractions/CMakeLists.txt index ac407682..5c7d86f7 100644 --- a/test_conformance/contractions/CMakeLists.txt +++ b/test_conformance/contractions/CMakeLists.txt @@ -10,6 +10,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/kernelHelpers.c ../../test_common/harness/testHarness.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/conversions/CMakeLists.txt b/test_conformance/conversions/CMakeLists.txt index ecdf8c41..0e90a1a9 100644 --- a/test_conformance/conversions/CMakeLists.txt +++ b/test_conformance/conversions/CMakeLists.txt @@ -20,6 +20,7 @@ set (${MODULE_NAME}_SOURCES ../../test_common/harness/parseParameters.cpp ../../test_common/harness/kernelHelpers.c ../../test_common/harness/testHarness.c + ../../test_common/harness/crc32.c ) if(ANDROID) diff --git a/test_conformance/d3d10/CMakeLists.txt b/test_conformance/d3d10/CMakeLists.txt index dbe39f0e..2b1a0761 100644 --- a/test_conformance/d3d10/CMakeLists.txt +++ b/test_conformance/d3d10/CMakeLists.txt @@ -32,7 +32,9 @@ set(D3D10_SOURCES ../../test_common/harness/mt19937.c ../../test_common/harness/conversions.c ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp) + ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c +) add_executable(conformance_test_d3d10 ${D3D10_SOURCES}) diff --git a/test_conformance/d3d11/CMakeLists.txt b/test_conformance/d3d11/CMakeLists.txt index 21a035ed..e6673dd4 100644 --- a/test_conformance/d3d11/CMakeLists.txt +++ b/test_conformance/d3d11/CMakeLists.txt @@ -32,7 +32,9 @@ set(D3D11_SOURCES ../../test_common/harness/mt19937.c ../../test_common/harness/conversions.c ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp) + ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c +) add_executable(conformance_test_d3d11 ${D3D11_SOURCES}) diff --git a/test_conformance/device_execution/CMakeLists.txt b/test_conformance/device_execution/CMakeLists.txt index 450db838..9ba35ca6 100644 --- a/test_conformance/device_execution/CMakeLists.txt +++ b/test_conformance/device_execution/CMakeLists.txt @@ -20,6 +20,7 @@ set(DEVICE_EXECUTION_SOURCES ../../test_common/harness/kernelHelpers.c ../../test_common/harness/msvc9.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/device_partition/CMakeLists.txt b/test_conformance/device_partition/CMakeLists.txt index c391e4c0..cb8f0c9f 100644 --- a/test_conformance/device_partition/CMakeLists.txt +++ b/test_conformance/device_partition/CMakeLists.txt @@ -13,5 +13,6 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/typeWrappers.cpp ../../test_common/harness/msvc9.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/device_timer/CMakeLists.txt b/test_conformance/device_timer/CMakeLists.txt index b37f6382..a0b24288 100644 --- a/test_conformance/device_timer/CMakeLists.txt +++ b/test_conformance/device_timer/CMakeLists.txt @@ -8,6 +8,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/testHarness.c ../../test_common/harness/parseParameters.cpp ../../test_common/harness/msvc9.c + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/events/CMakeLists.txt b/test_conformance/events/CMakeLists.txt index 88f7d319..7cfb995a 100644 --- a/test_conformance/events/CMakeLists.txt +++ b/test_conformance/events/CMakeLists.txt @@ -20,6 +20,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/msvc9.c ../../test_common/harness/ThreadPool.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/generic_address_space/CMakeLists.txt b/test_conformance/generic_address_space/CMakeLists.txt index da347abc..0e507359 100644 --- a/test_conformance/generic_address_space/CMakeLists.txt +++ b/test_conformance/generic_address_space/CMakeLists.txt @@ -11,6 +11,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/mt19937.c ../../test_common/harness/msvc9.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/geometrics/CMakeLists.txt b/test_conformance/geometrics/CMakeLists.txt index f88f0364..b7fef328 100644 --- a/test_conformance/geometrics/CMakeLists.txt +++ b/test_conformance/geometrics/CMakeLists.txt @@ -12,6 +12,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/conversions.c ../../test_common/harness/msvc9.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) # VS2005 optimization WAR for geom_length) diff --git a/test_conformance/gl/CMakeLists.txt b/test_conformance/gl/CMakeLists.txt index 3ebdf6c7..457a31ba 100644 --- a/test_conformance/gl/CMakeLists.txt +++ b/test_conformance/gl/CMakeLists.txt @@ -25,6 +25,7 @@ set (GL_SOURCES ../../test_common/harness/conversions.c ../../test_common/harness/msvc9.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) if (WIN32) diff --git a/test_conformance/gles/CMakeLists.txt b/test_conformance/gles/CMakeLists.txt index e64b58e8..c5294e82 100644 --- a/test_conformance/gles/CMakeLists.txt +++ b/test_conformance/gles/CMakeLists.txt @@ -22,6 +22,7 @@ set (${MODULE_NAME}_SOURCES ../../test_common/harness/conversions.c ../../test_common/harness/msvc9.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) if(ANDROID) diff --git a/test_conformance/half/CMakeLists.txt b/test_conformance/half/CMakeLists.txt index 51b7dc82..4b151270 100644 --- a/test_conformance/half/CMakeLists.txt +++ b/test_conformance/half/CMakeLists.txt @@ -12,6 +12,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/ThreadPool.c ../../test_common/harness/parseParameters.cpp ../../test_common/harness/testHarness.c + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/headers/CMakeLists.txt b/test_conformance/headers/CMakeLists.txt index 72482545..46705e6b 100644 --- a/test_conformance/headers/CMakeLists.txt +++ b/test_conformance/headers/CMakeLists.txt @@ -5,6 +5,7 @@ set(HEADERS_SOURCES ../../test_common/harness/testHarness.c ../../test_common/harness/msvc9.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) set_source_files_properties(${HEADERS_SOURCES} PROPERTIES LANGUAGE CXX) diff --git a/test_conformance/images/clCopyImage/CMakeLists.txt b/test_conformance/images/clCopyImage/CMakeLists.txt index f69ca0db..b876fdc7 100644 --- a/test_conformance/images/clCopyImage/CMakeLists.txt +++ b/test_conformance/images/clCopyImage/CMakeLists.txt @@ -22,6 +22,7 @@ set(${MODULE_NAME}_SOURCES ../../../test_common/harness/typeWrappers.cpp ../../../test_common/harness/msvc9.c ../../../test_common/harness/parseParameters.cpp + ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/images/clFillImage/CMakeLists.txt b/test_conformance/images/clFillImage/CMakeLists.txt index 7ee70944..274de2d7 100644 --- a/test_conformance/images/clFillImage/CMakeLists.txt +++ b/test_conformance/images/clFillImage/CMakeLists.txt @@ -21,6 +21,7 @@ set(${MODULE_NAME}_SOURCES ../../../test_common/harness/typeWrappers.cpp ../../../test_common/harness/msvc9.c ../../../test_common/harness/parseParameters.cpp + ../../../test_common/harness/crc32.c ) diff --git a/test_conformance/images/clGetInfo/CMakeLists.txt b/test_conformance/images/clGetInfo/CMakeLists.txt index df5f781a..7722f788 100644 --- a/test_conformance/images/clGetInfo/CMakeLists.txt +++ b/test_conformance/images/clGetInfo/CMakeLists.txt @@ -17,6 +17,7 @@ set(${MODULE_NAME}_SOURCES ../../../test_common/harness/typeWrappers.cpp ../../../test_common/harness/msvc9.c ../../../test_common/harness/parseParameters.cpp + ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/images/clReadWriteImage/CMakeLists.txt b/test_conformance/images/clReadWriteImage/CMakeLists.txt index b56b1e34..557d94df 100644 --- a/test_conformance/images/clReadWriteImage/CMakeLists.txt +++ b/test_conformance/images/clReadWriteImage/CMakeLists.txt @@ -18,6 +18,7 @@ set(${MODULE_NAME}_SOURCES ../../../test_common/harness/typeWrappers.cpp ../../../test_common/harness/msvc9.c ../../../test_common/harness/parseParameters.cpp + ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/images/kernel_image_methods/CMakeLists.txt b/test_conformance/images/kernel_image_methods/CMakeLists.txt index bc2663fd..e0477424 100644 --- a/test_conformance/images/kernel_image_methods/CMakeLists.txt +++ b/test_conformance/images/kernel_image_methods/CMakeLists.txt @@ -18,6 +18,7 @@ set(${MODULE_NAME}_SOURCES ../../../test_common/harness/typeWrappers.cpp ../../../test_common/harness/msvc9.c ../../../test_common/harness/parseParameters.cpp + ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/images/kernel_read_write/CMakeLists.txt b/test_conformance/images/kernel_read_write/CMakeLists.txt index 92109df2..808f285f 100644 --- a/test_conformance/images/kernel_read_write/CMakeLists.txt +++ b/test_conformance/images/kernel_read_write/CMakeLists.txt @@ -23,6 +23,7 @@ set(${MODULE_NAME}_SOURCES ../../../test_common/harness/typeWrappers.cpp ../../../test_common/harness/msvc9.c ../../../test_common/harness/parseParameters.cpp + ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/images/samplerlessReads/CMakeLists.txt b/test_conformance/images/samplerlessReads/CMakeLists.txt index 0f98f4ef..4926ef4d 100644 --- a/test_conformance/images/samplerlessReads/CMakeLists.txt +++ b/test_conformance/images/samplerlessReads/CMakeLists.txt @@ -19,6 +19,7 @@ set(${MODULE_NAME}_SOURCES ../../../test_common/harness/typeWrappers.cpp ../../../test_common/harness/msvc9.c ../../../test_common/harness/parseParameters.cpp + ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/integer_ops/CMakeLists.txt b/test_conformance/integer_ops/CMakeLists.txt index c5c41276..4f49c71f 100644 --- a/test_conformance/integer_ops/CMakeLists.txt +++ b/test_conformance/integer_ops/CMakeLists.txt @@ -20,6 +20,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/kernelHelpers.c ../../test_common/harness/msvc9.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/math_brute_force/CMakeLists.txt b/test_conformance/math_brute_force/CMakeLists.txt index 44fdb280..f0b39c6c 100644 --- a/test_conformance/math_brute_force/CMakeLists.txt +++ b/test_conformance/math_brute_force/CMakeLists.txt @@ -27,6 +27,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/kernelHelpers.c ../../test_common/harness/errorHelpers.c ../../test_common/harness/testHarness.c + ../../test_common/harness/crc32.c ) @@ -51,6 +52,7 @@ endif(NOT ANDROID) set_source_files_properties( ${MODULE_NAME}_SOURCES + ../../test_common/harness/crc32.c PROPERTIES LANGUAGE CXX) if (NOT CMAKE_CL_64 AND NOT MSVC AND NOT ANDROID) diff --git a/test_conformance/mem_host_flags/CMakeLists.txt b/test_conformance/mem_host_flags/CMakeLists.txt index 7325b34e..d1d2b794 100644 --- a/test_conformance/mem_host_flags/CMakeLists.txt +++ b/test_conformance/mem_host_flags/CMakeLists.txt @@ -15,6 +15,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/ThreadPool.c ../../test_common/harness/msvc9.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/multiple_device_context/CMakeLists.txt b/test_conformance/multiple_device_context/CMakeLists.txt index e69c884b..fe1fd227 100644 --- a/test_conformance/multiple_device_context/CMakeLists.txt +++ b/test_conformance/multiple_device_context/CMakeLists.txt @@ -14,6 +14,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/mt19937.c ../../test_common/harness/msvc9.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) @@ -30,6 +31,7 @@ set_source_files_properties( ../../test_common/harness/conversions.c ../../test_common/harness/msvc9.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c PROPERTIES LANGUAGE CXX) include(../CMakeCommon.txt) diff --git a/test_conformance/non_uniform_work_group/CMakeLists.txt b/test_conformance/non_uniform_work_group/CMakeLists.txt index 69dc4adb..ea2cc1af 100644 --- a/test_conformance/non_uniform_work_group/CMakeLists.txt +++ b/test_conformance/non_uniform_work_group/CMakeLists.txt @@ -13,6 +13,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/kernelHelpers.c ../../test_common/harness/msvc9.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/pipes/CMakeLists.txt b/test_conformance/pipes/CMakeLists.txt index e833f0ec..63bd916e 100644 --- a/test_conformance/pipes/CMakeLists.txt +++ b/test_conformance/pipes/CMakeLists.txt @@ -17,6 +17,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/conversions.c ../../test_common/harness/msvc9.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/printf/CMakeLists.txt b/test_conformance/printf/CMakeLists.txt index 59eacca5..71d73c16 100644 --- a/test_conformance/printf/CMakeLists.txt +++ b/test_conformance/printf/CMakeLists.txt @@ -16,6 +16,7 @@ set(${MODULE_NAME}_SOURCES #../../test_common/harness/imageHelpers.cpp ../../test_common/harness/parseParameters.cpp ../../test_common/harness/kernelHelpers.c + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/profiling/CMakeLists.txt b/test_conformance/profiling/CMakeLists.txt index ab6ca5f9..914d3295 100644 --- a/test_conformance/profiling/CMakeLists.txt +++ b/test_conformance/profiling/CMakeLists.txt @@ -18,6 +18,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/conversions.c ../../test_common/harness/msvc9.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/relationals/CMakeLists.txt b/test_conformance/relationals/CMakeLists.txt index 159b8e5b..81da7d2d 100644 --- a/test_conformance/relationals/CMakeLists.txt +++ b/test_conformance/relationals/CMakeLists.txt @@ -14,6 +14,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/conversions.c ../../test_common/harness/msvc9.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/select/CMakeLists.txt b/test_conformance/select/CMakeLists.txt index 6f25c466..97bd24b2 100644 --- a/test_conformance/select/CMakeLists.txt +++ b/test_conformance/select/CMakeLists.txt @@ -9,6 +9,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/kernelHelpers.c ../../test_common/harness/errorHelpers.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/spirv_new/CMakeLists.txt b/test_conformance/spirv_new/CMakeLists.txt index 23d6e3d6..48e0706b 100644 --- a/test_conformance/spirv_new/CMakeLists.txt +++ b/test_conformance/spirv_new/CMakeLists.txt @@ -17,6 +17,7 @@ set(CMAKE_CXX_STANDARD 11) file(GLOB SPIRV_NEW_SOURCES "*.cpp") set(TEST_HARNESS_SOURCES + ../../test_common/harness/crc32.c ../../test_common/harness/errorHelpers.c ../../test_common/harness/threadTesting.c ../../test_common/harness/testHarness.c diff --git a/test_conformance/subgroups/CMakeLists.txt b/test_conformance/subgroups/CMakeLists.txt index 37bf3088..7e7c11ce 100644 --- a/test_conformance/subgroups/CMakeLists.txt +++ b/test_conformance/subgroups/CMakeLists.txt @@ -15,6 +15,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/ThreadPool.c ../../test_common/harness/conversions.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/thread_dimensions/CMakeLists.txt b/test_conformance/thread_dimensions/CMakeLists.txt index e9022c93..68569771 100644 --- a/test_conformance/thread_dimensions/CMakeLists.txt +++ b/test_conformance/thread_dimensions/CMakeLists.txt @@ -12,6 +12,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/conversions.c ../../test_common/harness/msvc9.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) set_source_files_properties( diff --git a/test_conformance/vec_align/CMakeLists.txt b/test_conformance/vec_align/CMakeLists.txt index 74f41e7c..c66f559a 100644 --- a/test_conformance/vec_align/CMakeLists.txt +++ b/test_conformance/vec_align/CMakeLists.txt @@ -13,6 +13,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/errorHelpers.c ../../test_common/harness/conversions.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) set_source_files_properties( diff --git a/test_conformance/vec_step/CMakeLists.txt b/test_conformance/vec_step/CMakeLists.txt index 847dfd78..f9cf1a69 100644 --- a/test_conformance/vec_step/CMakeLists.txt +++ b/test_conformance/vec_step/CMakeLists.txt @@ -12,6 +12,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/kernelHelpers.c ../../test_common/harness/errorHelpers.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) set_source_files_properties( diff --git a/test_conformance/workgroups/CMakeLists.txt b/test_conformance/workgroups/CMakeLists.txt index ffef9383..0fc0c860 100644 --- a/test_conformance/workgroups/CMakeLists.txt +++ b/test_conformance/workgroups/CMakeLists.txt @@ -21,6 +21,7 @@ set(${MODULE_NAME}_SOURCES ../../test_common/harness/msvc9.c ../../test_common/harness/conversions.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_extensions/media_sharing/CMakeLists.txt b/test_extensions/media_sharing/CMakeLists.txt index 37073ed9..957395a2 100644 --- a/test_extensions/media_sharing/CMakeLists.txt +++ b/test_extensions/media_sharing/CMakeLists.txt @@ -20,6 +20,7 @@ set (MEDIA_SOURCES ../../test_common/harness/typeWrappers.cpp ../../test_common/harness/mt19937.c ../../test_common/harness/parseParameters.cpp + ../../test_common/harness/crc32.c ) add_executable(conformance_test_media_surface_sharing