From 4abea6f761f6320e420b815352b2a7d7bc850c0a Mon Sep 17 00:00:00 2001 From: Stephen Date: Mon, 1 Feb 2021 17:23:10 +0800 Subject: [PATCH] Fix literal integer types for atomics tests (#1059) * Fix literal integer types for atomics tests * [NFC] Format previous changes --- test_conformance/atomics/test_atomics.cpp | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/test_conformance/atomics/test_atomics.cpp b/test_conformance/atomics/test_atomics.cpp index 5f4c0943..34b34ed3 100644 --- a/test_conformance/atomics/test_atomics.cpp +++ b/test_conformance/atomics/test_atomics.cpp @@ -1004,8 +1004,7 @@ cl_long test_atomic_and_result_long( size_t size, cl_long *startRefValues, size_ // Last item doesn't get and'ed on every bit, so we have to mask away size_t numBits = (size_t)size - whichResult * 64; cl_long bits = (cl_long)0xffffffffffffffffLL; - for( size_t i = 0; i < numBits; i++ ) - bits &= ~( 1 << i ); + for (size_t i = 0; i < numBits; i++) bits &= ~(1LL << i); return bits; } @@ -1086,18 +1085,16 @@ int test_atomic_or(cl_device_id deviceID, cl_context context, cl_command_queue q #pragma mark ---- xor const char atom_xor_core[] = -" size_t numBits = sizeof( destMemory[0] ) * 8;\n" -" int bitIndex = tid & ( numBits - 1 );\n" -"\n" -" oldValues[tid] = atom_xor( &destMemory[0], 1 << bitIndex );\n" -; + " size_t numBits = sizeof( destMemory[0] ) * 8;\n" + " int bitIndex = tid & ( numBits - 1 );\n" + "\n" + " oldValues[tid] = atom_xor( &destMemory[0], 1L << bitIndex );\n"; const char atomic_xor_core[] = -" size_t numBits = sizeof( destMemory[0] ) * 8;\n" -" int bitIndex = tid & ( numBits - 1 );\n" -"\n" -" oldValues[tid] = atomic_xor( &destMemory[0], 1 << bitIndex );\n" -; + " size_t numBits = sizeof( destMemory[0] ) * 8;\n" + " int bitIndex = tid & ( numBits - 1 );\n" + "\n" + " oldValues[tid] = atomic_xor( &destMemory[0], 1L << bitIndex );\n"; cl_int test_atomic_xor_result_int( size_t size, cl_int *startRefValues, size_t whichResult ) {