Skip to content

Commit 81b55c3

Browse files
functional_tests: use size_t for size variable (#190)
Changed the data type of `size` to `size_t` in all functional tests to ensure consistency with rocSHMEM APIs. [ROCm/rocshmem commit: 7a5c6f8]
1 parent 63da8a1 commit 81b55c3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+183
-173
lines changed

projects/rocshmem/tests/functional_tests/amo_bitwise_tester.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ AMOBitwiseTester<T>::~AMOBitwiseTester() {
5555
}
5656

5757
template <typename T>
58-
void AMOBitwiseTester<T>::resetBuffers(uint64_t size) {
58+
void AMOBitwiseTester<T>::resetBuffers(size_t size) {
5959
memset(_r_buf, 0, args.max_msg_size);
6060
memset(_ret_val, 0, args.max_msg_size * args.num_wgs);
6161
memset(_s_buf, 0, args.max_msg_size * args.num_wgs);
6262
}
6363

6464
template <typename T>
6565
void AMOBitwiseTester<T>::launchKernel(dim3 gridsize, dim3 blocksize, int loop,
66-
uint64_t size) {
66+
size_t size) {
6767
size_t shared_bytes = 0;
6868

6969
hipLaunchKernelGGL(AMOBitwiseTest, gridsize, blocksize, shared_bytes, stream,
@@ -82,7 +82,7 @@ void AMOBitwiseTester<T>::launchKernel(dim3 gridsize, dim3 blocksize, int loop,
8282
#endif
8383

8484
template <typename T>
85-
void AMOBitwiseTester<T>::verifyResults(uint64_t size) {
85+
void AMOBitwiseTester<T>::verifyResults(size_t size) {
8686
T ret;
8787
if(DISABLE_IPC_TEST) {
8888
printf("AMO binary ops not implemented for IPC: values were not verified\n");

projects/rocshmem/tests/functional_tests/amo_bitwise_tester.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ class AMOBitwiseTester : public Tester {
3737
virtual ~AMOBitwiseTester();
3838

3939
protected:
40-
virtual void resetBuffers(uint64_t size) override;
40+
virtual void resetBuffers(size_t size) override;
4141

4242
virtual void launchKernel(dim3 gridSize, dim3 blockSize, int loop,
43-
uint64_t size) override;
43+
size_t size) override;
4444

45-
virtual void verifyResults(uint64_t size) override;
45+
virtual void verifyResults(size_t size) override;
4646

4747
dim3 _gridSize{};
4848
char *_r_buf;

projects/rocshmem/tests/functional_tests/amo_extended_tester.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ AMOExtendedTester<T>::~AMOExtendedTester() {
5555
}
5656

5757
template <typename T>
58-
void AMOExtendedTester<T>::resetBuffers(uint64_t size) {
58+
void AMOExtendedTester<T>::resetBuffers(size_t size) {
5959
memset(_r_buf, 0, args.max_msg_size);
6060
memset(_ret_val, 0, args.max_msg_size * args.num_wgs);
6161
memset(_s_buf, 0, args.max_msg_size * args.num_wgs);
6262
}
6363

6464
template <typename T>
6565
void AMOExtendedTester<T>::launchKernel(dim3 gridsize, dim3 blocksize, int loop,
66-
uint64_t size) {
66+
size_t size) {
6767
size_t shared_bytes = 0;
6868

6969
hipLaunchKernelGGL(AMOExtendedTest, gridsize, blocksize, shared_bytes, stream,
@@ -82,7 +82,7 @@ void AMOExtendedTester<T>::launchKernel(dim3 gridsize, dim3 blocksize, int loop,
8282
#endif
8383

8484
template <typename T>
85-
void AMOExtendedTester<T>::verifyResults(uint64_t size) {
85+
void AMOExtendedTester<T>::verifyResults(size_t size) {
8686
T ret;
8787
if (args.myid == 0) {
8888
T expected_val = 0;

projects/rocshmem/tests/functional_tests/amo_extended_tester.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ class AMOExtendedTester : public Tester {
3737
virtual ~AMOExtendedTester();
3838

3939
protected:
40-
virtual void resetBuffers(uint64_t size) override;
40+
virtual void resetBuffers(size_t size) override;
4141

4242
virtual void launchKernel(dim3 gridSize, dim3 blockSize, int loop,
43-
uint64_t size) override;
43+
size_t size) override;
4444

45-
virtual void verifyResults(uint64_t size) override;
45+
virtual void verifyResults(size_t size) override;
4646

4747
dim3 _gridSize{};
4848
char *_r_buf;

projects/rocshmem/tests/functional_tests/amo_standard_tester.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ AMOStandardTester<T>::~AMOStandardTester() {
5555
}
5656

5757
template <typename T>
58-
void AMOStandardTester<T>::resetBuffers(uint64_t size) {
58+
void AMOStandardTester<T>::resetBuffers(size_t size) {
5959
memset(_r_buf, 0, args.max_msg_size);
6060
memset(_ret_val, 0, args.max_msg_size * args.num_wgs);
6161
memset(_s_buf, 0, args.max_msg_size * args.num_wgs);
6262
}
6363

6464
template <typename T>
6565
void AMOStandardTester<T>::launchKernel(dim3 gridsize, dim3 blocksize, int loop,
66-
uint64_t size) {
66+
size_t size) {
6767
size_t shared_bytes = 0;
6868

6969
hipLaunchKernelGGL(AMOStandardTest, gridsize, blocksize, shared_bytes, stream,
@@ -76,7 +76,7 @@ void AMOStandardTester<T>::launchKernel(dim3 gridsize, dim3 blocksize, int loop,
7676
}
7777

7878
template <typename T>
79-
void AMOStandardTester<T>::verifyResults(uint64_t size) {
79+
void AMOStandardTester<T>::verifyResults(size_t size) {
8080
T ret;
8181
if (args.myid == 0) {
8282
T expected_val = 0;

projects/rocshmem/tests/functional_tests/amo_standard_tester.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ class AMOStandardTester : public Tester {
3737
virtual ~AMOStandardTester();
3838

3939
protected:
40-
virtual void resetBuffers(uint64_t size) override;
40+
virtual void resetBuffers(size_t size) override;
4141

4242
virtual void launchKernel(dim3 gridSize, dim3 blockSize, int loop,
43-
uint64_t size) override;
43+
size_t size) override;
4444

45-
virtual void verifyResults(uint64_t size) override;
45+
virtual void verifyResults(size_t size) override;
4646

4747
dim3 _gridSize{};
4848
char *_r_buf;

projects/rocshmem/tests/functional_tests/barrier_all_tester.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ BarrierAllTester::BarrierAllTester(TesterArguments args) : Tester(args) {}
9595
BarrierAllTester::~BarrierAllTester() {}
9696

9797
void BarrierAllTester::launchKernel(dim3 gridSize, dim3 blockSize, int loop,
98-
uint64_t size) {
98+
size_t size) {
9999
size_t shared_bytes = 0;
100100

101101
hipLaunchKernelGGL(BarrierAllTest, gridSize, blockSize, shared_bytes, stream,
@@ -105,6 +105,6 @@ void BarrierAllTester::launchKernel(dim3 gridSize, dim3 blockSize, int loop,
105105
num_timed_msgs = loop;
106106
}
107107

108-
void BarrierAllTester::resetBuffers(uint64_t size) {}
108+
void BarrierAllTester::resetBuffers(size_t size) {}
109109

110-
void BarrierAllTester::verifyResults(uint64_t size) {}
110+
void BarrierAllTester::verifyResults(size_t size) {}

projects/rocshmem/tests/functional_tests/barrier_all_tester.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ class BarrierAllTester : public Tester {
4141
virtual ~BarrierAllTester();
4242

4343
protected:
44-
virtual void resetBuffers(uint64_t size) override;
44+
virtual void resetBuffers(size_t size) override;
4545

4646
virtual void launchKernel(dim3 gridSize, dim3 blockSize, int loop,
47-
uint64_t size) override;
47+
size_t size) override;
4848

49-
virtual void verifyResults(uint64_t size) override;
49+
virtual void verifyResults(size_t size) override;
5050
};
5151

5252
#endif

projects/rocshmem/tests/functional_tests/default_ctx_primitive_tester.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
__global__ void DefaultCTXPrimitiveTest(int loop, int skip,
3535
long long int *start_time,
3636
long long int *end_time, char *source,
37-
char *dest, int size, TestType type,
37+
char *dest, size_t size, TestType type,
3838
ShmemContextType ctx_type, int wf_size) {
3939
int wg_id = get_flat_grid_id();
4040
int t_id = get_flat_block_id();
@@ -51,7 +51,7 @@
5151
/**
5252
* Calculate start index for each thread within the grid
5353
*/
54-
uint64_t offset = size * get_flat_id();
54+
size_t offset = size * get_flat_id();
5555
source += offset;
5656
dest += offset;
5757

@@ -155,13 +155,13 @@
155155
rocshmem_free(dest);
156156
}
157157

158-
void DefaultCTXPrimitiveTester::resetBuffers(uint64_t size) {
158+
void DefaultCTXPrimitiveTester::resetBuffers(size_t size) {
159159
size_t buff_size = size * args.wg_size * args.num_wgs;
160160
memset(dest, '1', buff_size);
161161
}
162162

163163
void DefaultCTXPrimitiveTester::launchKernel(dim3 gridSize, dim3 blockSize,
164-
int loop, uint64_t size) {
164+
int loop, size_t size) {
165165
size_t shared_bytes = 0;
166166

167167
hipLaunchKernelGGL(DefaultCTXPrimitiveTest, gridSize, blockSize,
@@ -173,7 +173,7 @@
173173
num_timed_msgs = loop * gridSize.x * blockSize.x;
174174
}
175175

176-
void DefaultCTXPrimitiveTester::verifyResults(uint64_t size) {
176+
void DefaultCTXPrimitiveTester::verifyResults(size_t size) {
177177
int check_id =
178178
(_type == DefaultCTXGetTestType ||
179179
_type == DefaultCTXGetNBITestType || _type == DefaultCTXGTestType)
@@ -182,7 +182,7 @@
182182

183183
if (args.myid == check_id) {
184184
size_t buff_size = size * args.wg_size * args.num_wgs;
185-
for (uint64_t i = 0; i < buff_size; i++) {
185+
for (size_t i = 0; i < buff_size; i++) {
186186
if (dest[i] != source[i]) {
187187
std::cerr << "Data validation error at idx " << i << std::endl;
188188
std::cerr << " Got " << dest[i] << ", Expected "

projects/rocshmem/tests/functional_tests/default_ctx_primitive_tester.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ class DefaultCTXPrimitiveTester : public Tester {
3636
virtual ~DefaultCTXPrimitiveTester();
3737

3838
protected:
39-
virtual void resetBuffers(uint64_t size) override;
39+
virtual void resetBuffers(size_t size) override;
4040

4141
virtual void launchKernel(dim3 gridSize, dim3 blockSize, int loop,
42-
uint64_t size) override;
42+
size_t size) override;
4343

44-
virtual void verifyResults(uint64_t size) override;
44+
virtual void verifyResults(size_t size) override;
4545

4646
char *source = nullptr;
4747
char *dest = nullptr;

0 commit comments

Comments
 (0)