From b83ff2fa84d82949dcf2e9724513836a1bd482d9 Mon Sep 17 00:00:00 2001 From: Yiltan Hassan Temucin Date: Thu, 6 Feb 2025 13:12:09 -0600 Subject: [PATCH] Use the precalculated num_warps variable --- scripts/functional_tests/driver.sh | 4 ++-- tests/functional_tests/signaling_operations_tester.cpp | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/functional_tests/driver.sh b/scripts/functional_tests/driver.sh index 2e2e835090..cb31c766f9 100755 --- a/scripts/functional_tests/driver.sh +++ b/scripts/functional_tests/driver.sh @@ -270,13 +270,13 @@ TestSigOps() { ExecTest "putsignal" 2 2 32 1048576 ExecTest "wgputsignal" 2 2 32 1048576 ExecTest "waveputsignal" 2 1 32 1048576 - ExecTest "waveputsignal" 2 1 64 1048576 + ExecTest "waveputsignal" 2 2 64 1048576 ExecTest "putsignalnbi" 2 1 1 1048576 ExecTest "putsignalnbi" 2 2 32 1048576 ExecTest "wgputsignalnbi" 2 2 32 1048576 ExecTest "waveputsignalnbi" 2 1 32 1048576 - ExecTest "waveputsignalnbi" 2 1 64 1048576 + ExecTest "waveputsignalnbi" 2 2 64 1048576 ExecTest "signalfetch" 2 1 1 ExecTest "wgsignalfetch" 2 2 32 diff --git a/tests/functional_tests/signaling_operations_tester.cpp b/tests/functional_tests/signaling_operations_tester.cpp index 0a5ac18e5e..45ddbd90ab 100644 --- a/tests/functional_tests/signaling_operations_tester.cpp +++ b/tests/functional_tests/signaling_operations_tester.cpp @@ -201,7 +201,6 @@ void SignalingOperationsTester::verifyResults(uint64_t size) { } else if (ROCSHMEM_SIGNAL_ADD == sig_op) { uint64_t value = *sig_addr; uint64_t expected_value = (args.myid + 123); // Initial Value - uint64_t num_waves = 1; switch (_type) { case PutSignalTestType: @@ -214,8 +213,7 @@ void SignalingOperationsTester::verifyResults(uint64_t size) { break; case WAVEPutSignalTestType: case WAVEPutSignalNBITestType: - num_waves = max(1, (args.num_wgs / __AMDGCN_WAVEFRONT_SIZE__)); - expected_value += ((args.skip + args.loop) * num_waves); + expected_value += ((args.skip + args.loop) * args.num_wgs * num_warps); break; default: fprintf(stderr, "Invalid Test\n");