Skip to content

Enable testing for __sync_fetch_and_nand. NFC #15620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 24, 2021
Merged

Enable testing for __sync_fetch_and_nand. NFC #15620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 1 addition & 25 deletions tests/pthread/test_pthread_gcc_64bit_atomic_fetch_and_op.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,6 @@

#define T uint64_t

#if 0
// TEMP to make this test pass:
// Our Clang backend doesn't define this builtin function, so implement it ourselves.
// The current Atomics spec doesn't have the nand atomic op either, so must use a cas loop.
// TODO: Move this to Clang backend?
T __sync_fetch_and_nand(T *ptr, T x)
{
for(;;)
{
T old = emscripten_atomic_load_u32(ptr);
T newVal = ~(old & x);
T old2 = emscripten_atomic_cas_u32(ptr, old, newVal);
if (old2 == old) return old;
}
}
#endif

void *thread_fetch_and_add(void *arg)
{
for(int i = 0; i < 10000; ++i)
Expand Down Expand Up @@ -69,19 +52,15 @@ void *thread_fetch_and_xor(void *arg)
__sync_fetch_and_xor((T*)&fetch_and_xor_data, *(T*)arg);
pthread_exit(0);
}
#if 0

// XXX NAND support does not exist in Atomics API.
#if 0
volatile long fetch_and_nand_data = 0;
void *thread_fetch_and_nand(void *arg)
{
for(int i = 0; i < 9999; ++i) // Odd number of times so that the operation doesn't cancel itself out.
__sync_fetch_and_nand((long*)&fetch_and_nand_data, (long)arg);
pthread_exit(0);
}
#endif
#endif

T threadArg[NUM_THREADS];
pthread_t thread[NUM_THREADS];

Expand Down Expand Up @@ -178,8 +157,6 @@ int main()
}
}
}
// XXX NAND support does not exist in Atomics API.
#if 0
{
T x = 5;
T y = __sync_fetch_and_nand(&x, 9);
Expand All @@ -194,7 +171,6 @@ int main()
assert(fetch_and_nand_data == -1);
}
}
#endif

return 0;
}
32 changes: 4 additions & 28 deletions tests/pthread/test_pthread_gcc_64bit_atomic_op_and_fetch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,6 @@

#define T uint64_t

#if 0
// TEMP to make this test pass:
// Our Clang backend doesn't define this builtin function, so implement it ourselves.
// The current Atomics spec doesn't have the nand atomic op either, so must use a cas loop.
// TODO: Move this to Clang backend?
T __sync_nand_and_fetch(T *ptr, T x)
{
for(;;)
{
T old = emscripten_atomic_load_u32(ptr);
T newVal = ~(old & x);
T old2 = emscripten_atomic_cas_u32(ptr, old, newVal);
if (old2 == old) return old;
}
}
#endif

void *thread_add_and_fetch(void *arg)
{
for(int i = 0; i < 10000; ++i)
Expand Down Expand Up @@ -69,19 +52,15 @@ void *thread_xor_and_fetch(void *arg)
__sync_xor_and_fetch((T*)&xor_and_fetch_data, *(T*)arg);
pthread_exit(0);
}
#if 0

// XXX NAND support does not exist in Atomics API.
#if 0
volatile long nand_and_fetch_data = 0;
volatile T nand_and_fetch_data = 0;
void *thread_nand_and_fetch(void *arg)
{
for(int i = 0; i < 9999; ++i) // Odd number of times so that the operation doesn't cancel itself out.
__sync_nand_and_fetch((long*)&nand_and_fetch_data, (long)arg);
__sync_nand_and_fetch((T*)&nand_and_fetch_data, (T)arg);
pthread_exit(0);
}
#endif
#endif

T threadArg[NUM_THREADS];
pthread_t thread[NUM_THREADS];

Expand Down Expand Up @@ -178,12 +157,10 @@ int main()
}
}
}
// XXX NAND support does not exist in Atomics API.
#if 0
{
T x = 5;
T y = __sync_nand_and_fetch(&x, 9);
assert(y == 5);
assert(y == -2);
assert(x == -2);
const int oddNThreads = NUM_THREADS-1;
for(int x = 0; x < 100; ++x) // Test a few times for robustness, since this test is so short-lived.
Expand All @@ -194,7 +171,6 @@ int main()
assert(nand_and_fetch_data == -1);
}
}
#endif

return 0;
}
30 changes: 4 additions & 26 deletions tests/pthread/test_pthread_gcc_atomic_fetch_and_op.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,6 @@

#define T int

#if 0
// TEMP to make this test pass:
// Our Clang backend doesn't define this builtin function, so implement it ourselves.
// The current Atomics spec doesn't have the nand atomic op either, so must use a cas loop.
// TODO: Move this to Clang backend?
T __sync_fetch_and_nand(T *ptr, T x)
{
for(;;)
{
T old = emscripten_atomic_load_u32(ptr);
T newVal = ~(old & x);
T old2 = emscripten_atomic_cas_u32(ptr, old, newVal);
if (old2 == old) return old;
}
}
#endif

void *thread_fetch_and_add(void *arg)
{
for(int i = 0; i < 10000; ++i)
Expand Down Expand Up @@ -72,15 +55,13 @@ void *thread_fetch_and_xor(void *arg)
}

// XXX NAND support does not exist in Atomics API.
#if 0
volatile long fetch_and_nand_data = 0;
void *thread_fetch_and_nand(void *arg)
{
for(int i = 0; i < 9999; ++i) // Odd number of times so that the operation doesn't cancel itself out.
__sync_fetch_and_nand(&fetch_and_nand_data, (long)arg);
pthread_exit(0);
}
#endif

pthread_t thread[NUM_THREADS];

Expand Down Expand Up @@ -161,12 +142,6 @@ int main()
}
}

// Test that regex replacing also works on these.
emscripten_atomic_fence();
__sync_synchronize();

// XXX NAND support does not exist in Atomics API.
#if 0
{
T x = 5;
T y = __sync_fetch_and_nand(&x, 9);
Expand All @@ -181,7 +156,10 @@ int main()
assert(fetch_and_nand_data == -1);
}
}
#endif

// Test that regex replacing also works on these.
emscripten_atomic_fence();
__sync_synchronize();

return 0;
}
23 changes: 0 additions & 23 deletions tests/pthread/test_pthread_gcc_atomic_op_and_fetch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,6 @@

#define T int

#if 0
// TEMP to make this test pass:
// Our Clang backend doesn't define this builtin function, so implement it ourselves.
// The current Atomics spec doesn't have the nand atomic op either, so must use a cas loop.
// TODO: Move this to Clang backend?
T __sync_nand_and_fetch(T *ptr, T x)
{
for(;;)
{
T old = emscripten_atomic_load_u32(ptr);
T newVal = ~(old & x);
T old2 = emscripten_atomic_cas_u32(ptr, old, newVal);
if (old2 == old) return newVal;
}
}
#endif

void *thread_add_and_fetch(void *arg)
{
for(int i = 0; i < 10000; ++i)
Expand Down Expand Up @@ -71,16 +54,13 @@ void *thread_xor_and_fetch(void *arg)
pthread_exit(0);
}

// XXX NAND support does not exist in Atomics API.
#if 0
volatile long nand_and_fetch_data = 0;
void *thread_nand_and_fetch(void *arg)
{
for(int i = 0; i < 9999; ++i) // Odd number of times so that the operation doesn't cancel itself out.
__sync_nand_and_fetch((long*)&nand_and_fetch_data, (long)arg);
pthread_exit(0);
}
#endif

pthread_t thread[NUM_THREADS];

Expand Down Expand Up @@ -160,8 +140,6 @@ int main()
}
}
}
// XXX NAND support does not exist in Atomics API.
#if 0
{
T x = 5;
T y = __sync_nand_and_fetch(&x, 9);
Expand All @@ -176,7 +154,6 @@ int main()
assert(nand_and_fetch_data == -1);
}
}
#endif

return 0;
}
10 changes: 9 additions & 1 deletion tests/test_browser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3802,6 +3802,7 @@ def test_pthread_main_thread_blocking(self, name):
# Test the old GCC atomic __sync_fetch_and_op builtin operations.
@requires_threads
def test_pthread_gcc_atomic_fetch_and_op(self):
self.emcc_args += ['-Wno-sync-fetch-and-nand-semantics-changed']
for opt in [[], ['-O1'], ['-O2'], ['-O3'], ['-Os']]:
for debug in [[], ['-g']]:
args = opt + debug
Expand All @@ -3812,19 +3813,26 @@ def test_pthread_gcc_atomic_fetch_and_op(self):
@also_with_wasm2js
@requires_threads
def test_pthread_gcc_64bit_atomic_fetch_and_op(self):
if not self.is_wasm():
self.skipTest('https://github.com/WebAssembly/binaryen/issues/4358')
self.emcc_args += ['-Wno-sync-fetch-and-nand-semantics-changed']
self.btest_exit(test_file('pthread/test_pthread_gcc_64bit_atomic_fetch_and_op.cpp'), args=['-s', 'INITIAL_MEMORY=64MB', '-O3', '-s', 'USE_PTHREADS', '-s', 'PTHREAD_POOL_SIZE=8'])

# Test the old GCC atomic __sync_op_and_fetch builtin operations.
@also_with_wasm2js
@requires_threads
def test_pthread_gcc_atomic_op_and_fetch(self):
self.emcc_args += ['-Wno-sync-fetch-and-nand-semantics-changed']
self.btest_exit(test_file('pthread/test_pthread_gcc_atomic_op_and_fetch.cpp'), args=['-s', 'INITIAL_MEMORY=64MB', '-O3', '-s', 'USE_PTHREADS', '-s', 'PTHREAD_POOL_SIZE=8'])

# 64 bit version of the above test.
@also_with_wasm2js
@requires_threads
def test_pthread_gcc_64bit_atomic_op_and_fetch(self):
self.btest_exit(test_file('pthread/test_pthread_gcc_64bit_atomic_op_and_fetch.cpp'), args=['-s', 'INITIAL_MEMORY=64MB', '-O3', '-s', 'USE_PTHREADS', '-s', 'PTHREAD_POOL_SIZE=8'])
if not self.is_wasm():
self.skipTest('https://github.com/WebAssembly/binaryen/issues/4358')
self.emcc_args += ['-Wno-sync-fetch-and-nand-semantics-changed', '--profiling-funcs']
self.btest_exit(test_file('pthread/test_pthread_gcc_64bit_atomic_op_and_fetch.cpp'), args=['-s', 'INITIAL_MEMORY=64MB', '-s', 'USE_PTHREADS', '-O2', '-s', 'PTHREAD_POOL_SIZE=8'])

# Tests the rest of the remaining GCC atomics after the two above tests.
@also_with_wasm2js
Expand Down