Skip to content

Commit 22a25d6

Browse files
GonzalosilvaldeGonzalosilvalde
committed
enable 32-bit build support
Signed-off-by: Gonzalo Silvalde <[email protected]>
1 parent f826281 commit 22a25d6

Some content is hidden

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

82 files changed

+379
-351
lines changed

‎fabtests/benchmarks/rdm_bw_mt.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ static int mt_reg_mr(struct fi_info *fi, void *buf, size_t size,
288288
dmabuf.fd = dmabuf_fd;
289289
dmabuf.offset = dmabuf_offset;
290290
dmabuf.len = size;
291-
dmabuf.base_addr = (void *)((uintptr_t) buf - dmabuf_offset);
291+
dmabuf.base_addr = (void *)((char *) buf - dmabuf_offset);
292292
flags |= FI_MR_DMABUF;
293293
}
294294

‎fabtests/common/shared.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ int ft_get_dmabuf_from_iov(struct fi_mr_dmabuf *dmabuf,
434434
dmabuf[i].fd = dmabuf_fd;
435435
dmabuf[i].offset = dmabuf_offset;
436436
dmabuf[i].len = iov[i].iov_len;
437-
dmabuf[i].base_addr = (void *)(
437+
dmabuf[i].base_addr = (void *)(uintptr_t)(
438438
(uintptr_t) iov[i].iov_base - dmabuf_offset);
439439
}
440440
return FI_SUCCESS;
@@ -469,7 +469,7 @@ int ft_reg_mr(struct fi_info *fi, void *buf, size_t size, uint64_t access,
469469
dmabuf.fd = dmabuf_fd;
470470
dmabuf.offset = dmabuf_offset;
471471
dmabuf.len = size;
472-
dmabuf.base_addr = (void *)((uintptr_t) buf - dmabuf_offset);
472+
dmabuf.base_addr = (void *)((char *) buf - dmabuf_offset);
473473
flags |= FI_MR_DMABUF;
474474
}
475475

‎fabtests/prov/efa/src/efa_implicit_av_test.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ static int run_test(void)
361361
FT_INFO("Not using implicit AV. Full address exchange \n");
362362
for (i = 0; i < num_server_eps; i++) {
363363
ft_init_av_dst_addr(server_avs[i], server_eps[i], &remote_fiaddr[i]);
364-
FT_INFO("fi_addr %ld\n", remote_fiaddr[i]);
364+
FT_INFO("fi_addr %" PRIu64 "\n", remote_fiaddr[i]);
365365
}
366366
}
367367

@@ -474,13 +474,13 @@ int main(int argc, char **argv)
474474
if (!ft_use_size(i, opts.sizes_enabled))
475475
continue;
476476
opts.transfer_size = test_size[i].size;
477-
FT_INFO("Running test for message size: %ld\n", opts.transfer_size);
477+
FT_INFO("Running test for message size: %zu\n", opts.transfer_size);
478478
ret = run_test();
479479
if (ret)
480480
return ret;
481481
}
482482
} else {
483-
FT_INFO("Running test for message size: %ld\n",
483+
FT_INFO("Running test for message size: %zu\n",
484484
opts.transfer_size);
485485
ret = run_test();
486486
if (ret)

‎fabtests/prov/efa/src/efa_mmap_test.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ static int run_test(void)
162162
failed_tests++;
163163
}
164164

165-
printf("\nTest Summary: %ld/%ld tests passed\n",
165+
printf("\nTest Summary: %u/%u tests passed\n",
166166
NUM_TEST_CASES - failed_tests, NUM_TEST_CASES);
167167

168168
return failed_tests > 0 ? -1 : 0;

‎fabtests/prov/efa/src/multi_ep_stress.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ void *notification_handler(void *arg)
334334
&msg.info.rma,
335335
sizeof(struct rma_info));
336336
if (topts.verbose) {
337-
printf("Sender %d: Updated EP for receiver %d (fi_addr=%lu)\n",
337+
printf("Sender %d: Updated EP for receiver %d (fi_addr=%" PRIu64 ")\n",
338338
ctx->worker_id,
339339
msg.info.worker_id,
340340
fi_addr);
@@ -376,7 +376,7 @@ void *notification_handler(void *arg)
376376
if (ret == 1) {
377377
ctx->peer_addrs[i] = fi_addr;
378378
if (topts.verbose) {
379-
printf("Sender %d: Re-inserted address for peer %d (fi_addr=%lu)\n",
379+
printf("Sender %d: Re-inserted address for peer %d (fi_addr=%" PRIu64 ")\n",
380380
ctx->worker_id, i, fi_addr);
381381
}
382382
}
@@ -767,7 +767,7 @@ static void *run_sender_worker(void *arg)
767767
}
768768
}
769769

770-
printf("Sender %d: All cycles completed, total ops=%lu\n",
770+
printf("Sender %d: All cycles completed, total ops=%" PRIu64 "\n",
771771
ctx->worker_id, total_ops);
772772

773773
out:
@@ -795,7 +795,7 @@ static int notify_endpoint_update(struct receiver_context *ctx)
795795
return ret;
796796

797797
// Fill RMA info
798-
msg.info.rma.remote_addr = (uint64_t) ctx->rx_buf;
798+
msg.info.rma.remote_addr = (uint64_t)(uintptr_t) ctx->rx_buf;
799799
msg.info.rma.rkey = fi_mr_key(ctx->mr);
800800
msg.info.rma.length = opts.transfer_size * topts.msgs_per_endpoint * ctx->num_senders;
801801

‎fabtests/prov/lpp/src/atomic.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ int run_simple_atomic_write(struct rank_info *ri)
5050
.count = count,
5151
};
5252
struct fi_rma_ioc rma_iov = {
53-
.addr = (uint64_t)pri->mr_info[0].uaddr,
53+
.addr = (uint64_t)(uintptr_t)pri->mr_info[0].uaddr,
5454
.count = count,
5555
.key = pri->mr_info[0].key,
5656
};
@@ -102,7 +102,7 @@ int run_simple_atomic_write2(struct rank_info *ri)
102102
INSIST_FI_EQ(ri,
103103
fi_atomic(ri->ep_info[0].fid, ri->mr_info[0].uaddr,
104104
count, NULL, pri->ep_info[0].fi_addr,
105-
(uint64_t)pri->mr_info[0].uaddr,
105+
(uint64_t)(uintptr_t)pri->mr_info[0].uaddr,
106106
pri->mr_info[0].key, FI_UINT16,
107107
FI_ATOMIC_WRITE,
108108
get_ctx_simple(ri, context)),
@@ -168,7 +168,7 @@ int run_simple_atomic_fetch_write(struct rank_info *ri)
168168
.count = count,
169169
};
170170
struct fi_rma_ioc rma_iov = {
171-
.addr = (uint64_t)pri->mr_info[0].uaddr,
171+
.addr = (uint64_t)(uintptr_t)pri->mr_info[0].uaddr,
172172
.count = count,
173173
.key = pri->mr_info[0].key,
174174
};
@@ -258,7 +258,7 @@ int run_simple_atomic_fetch_write2(struct rank_info *ri)
258258
ri->mr_info[0].uaddr, count, NULL,
259259
ri->mr_info[1].uaddr, NULL,
260260
pri->ep_info[0].fi_addr,
261-
(uint64_t)pri->mr_info[0].uaddr,
261+
(uint64_t)(uintptr_t)pri->mr_info[0].uaddr,
262262
pri->mr_info[0].key, FI_UINT16,
263263
FI_ATOMIC_WRITE,
264264
get_ctx_simple(ri, context)),
@@ -302,7 +302,7 @@ int run_simple_atomic_fetch_read(struct rank_info *ri)
302302

303303
if (my_node == NODE_A) {
304304
struct fi_rma_ioc rma_iov = {
305-
.addr = (uint64_t)pri->mr_info[0].uaddr,
305+
.addr = (uint64_t)(uintptr_t)pri->mr_info[0].uaddr,
306306
.count = count,
307307
.key = pri->mr_info[0].key,
308308
};
@@ -363,7 +363,7 @@ int run_simple_atomic_fetch_read2(struct rank_info *ri)
363363
fi_fetch_atomic(ri->ep_info[0].fid, NULL, count,
364364
NULL, ri->mr_info[0].uaddr, NULL,
365365
pri->ep_info[0].fi_addr,
366-
(uint64_t)pri->mr_info[0].uaddr,
366+
(uint64_t)(uintptr_t)pri->mr_info[0].uaddr,
367367
pri->mr_info[0].key, FI_UINT16,
368368
FI_ATOMIC_READ,
369369
get_ctx_simple(ri, context)),
@@ -437,7 +437,7 @@ int run_simple_atomic_cswap(struct rank_info *ri)
437437
.count = count,
438438
};
439439
struct fi_rma_ioc rma_iov = {
440-
.addr = (uint64_t)pri->mr_info[0].uaddr,
440+
.addr = (uint64_t)(uintptr_t)pri->mr_info[0].uaddr,
441441
.count = count,
442442
.key = pri->mr_info[0].key,
443443
};
@@ -541,7 +541,7 @@ int run_simple_atomic_cswap2(struct rank_info *ri)
541541
count, NULL, ri->mr_info[1].uaddr, NULL,
542542
ri->mr_info[2].uaddr, NULL,
543543
pri->ep_info[0].fi_addr,
544-
(uint64_t)pri->mr_info[0].uaddr,
544+
(uint64_t)(uintptr_t)pri->mr_info[0].uaddr,
545545
pri->mr_info[0].key, FI_UINT8, FI_CSWAP,
546546
get_ctx_simple(ri, context)),
547547
0);

‎fabtests/prov/lpp/src/error.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void debug_trace_push(struct rank_info *ri, int line, const char *func,
6161
} else {
6262
strcat(newstr, "\n");
6363
}
64-
debugln(file, line, "[rank:%ld node:%c iter:%ld test:%s] %s",
64+
debugln(file, line, "[rank:%" PRIu64 " node:%c iter:%" PRId64 " test:%s] %s",
6565
(ri)->rank, my_node_name, (ri)->iteration, (ri)->cur_test_name,
6666
newstr);
6767
}
@@ -76,7 +76,7 @@ void debug_dump_trace(struct rank_info *ri)
7676
for (int i = 0; i < ri->tracei; i++) {
7777
fprintf(stderr,
7878
RED_CODE
79-
"trace: %s():%s:%d [rank:%ld node:%c iter:%ld]" RESET_CODE
79+
"trace: %s():%s:%d [rank:%" PRIu64 " node:%c iter:%" PRId64 "]" RESET_CODE
8080
"\n",
8181
ri->trace_funcs[i], ri->trace_files[i],
8282
ri->trace_lines[i], ri->rank, my_node_name,

‎fabtests/prov/lpp/src/error.h‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#include <string.h>
3838
#include <errno.h>
3939
#include <stdbool.h>
40+
#include <inttypes.h>
4041

4142
#define RED_CODE "\033[1;31m"
4243
#define RESET_CODE "\033[0m"
@@ -55,8 +56,8 @@
5556
#define debug(fmt, ...) debugln(__FILE__, __LINE__, fmt, ##__VA_ARGS__)
5657

5758
#define debugt(ri, msg) \
58-
debugln(__FILE__, __LINE__, "[rank:%ld node:%c iter:%ld test:%s] %s", \
59-
(ri)->rank, my_node_name, (ri)->iteration, \
59+
debugln(__FILE__, __LINE__, "[rank:%" PRId64 " node:%c iter:%" PRId64 " test:%s] %s", \
60+
(int64_t)(ri)->rank, my_node_name, (int64_t)(ri)->iteration, \
6061
(ri)->cur_test_name, msg)
6162

6263
// Like errx() from err.h.
@@ -81,16 +82,16 @@
8182
#define ERRORX(ri, fmt, ...) \
8283
do { \
8384
debug_dump_trace((ri)); \
84-
errorx("[rank:%ld node:%c iter:%ld] " fmt, ri->rank, \
85-
my_node_name, ri->iteration, ##__VA_ARGS__) \
85+
errorx("[rank:%" PRId64 " node:%c iter:%" PRId64 "] " fmt, (int64_t)(ri)->rank, \
86+
my_node_name, (int64_t)(ri)->iteration, ##__VA_ARGS__) \
8687
} while (0)
8788

8889
// Like error(), but with context about the current rank.
8990
#define ERROR(ri, fmt, ...) \
9091
do { \
9192
debug_dump_trace((ri)); \
92-
error("[rank:%ld node:%c iter:%ld] " fmt, ri->rank, \
93-
my_node_name, ri->iteration, ##__VA_ARGS__) \
93+
error("[rank:%" PRId64 " node:%c iter:%" PRId64 "] " fmt, (int64_t)ri->rank, \
94+
my_node_name, (int64_t)ri->iteration, ##__VA_ARGS__) \
9495
} while (0)
9596

9697
#define INSIST(ri, condition) \

‎fabtests/prov/lpp/src/ipc.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,15 +246,15 @@ static void *info_server_thread(void *arg)
246246
error("recv IPC_HELLO failed: %d\n", ret);
247247
}
248248
if (hello.rank >= MAX_RANK) {
249-
errorx("rank %lu too large", hello.rank);
249+
errorx("rank %" PRIu64 " too large", (uint64_t)hello.rank);
250250
}
251251

252252
struct rank_info *ri = &rank_info[hello.rank];
253253
pthread_mutex_lock(&ri->lock);
254254
if (ri->valid != 1 || ri->iteration != hello.iteration ||
255255
ri->peer_comm_sock >= 0) {
256256
if (verbose) {
257-
debug("close() valid %d iteration %ld %ld peer_comm_sock %d\n",
257+
debug("close() valid %d iteration %" PRId64 " %" PRId64 " peer_comm_sock %d\n",
258258
ri->valid, ri->iteration, hello.iteration,
259259
ri->peer_comm_sock);
260260
}
@@ -310,14 +310,14 @@ static void clear_rank_info(struct rank_info *ri)
310310
struct rank_info *get_rank_info(uint64_t rank, int64_t iteration)
311311
{
312312
if (rank >= MAX_RANK) {
313-
errorx("rank %ld out of range", rank);
313+
errorx("rank %" PRId64 " out of range", (int64_t)rank);
314314
}
315315

316316
struct rank_info *ri = &rank_info[rank];
317317

318318
pthread_mutex_lock(&ri->lock);
319319
if (ri->valid == 1) {
320-
errorx("duplicate get for rank %ld", rank);
320+
errorx("duplicate get for rank %" PRId64, (int64_t)rank);
321321
}
322322
clear_rank_info(ri);
323323
ri->iteration = iteration;

‎fabtests/prov/lpp/src/main.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ static int test_filtered(const char *test_name)
226226

227227
static void *worker_thread(void *arg)
228228
{
229-
uint64_t rank = (uint64_t)arg;
229+
uint64_t rank = (uint64_t)(uintptr_t)arg;
230230

231231
while (1) {
232232
// First barrier: begin testing for this iteration.
@@ -326,7 +326,7 @@ static void run_tests(int parallel)
326326
assert(threads);
327327
for (uint64_t rank = 0; rank < nthreads; rank++) {
328328
if (pthread_create(&threads[rank], NULL, worker_thread,
329-
(void *)rank) != 0) {
329+
(void *)(uintptr_t)rank) != 0) {
330330
errorx("pthread_create() failed");
331331
}
332332
}
@@ -354,13 +354,13 @@ static void run_tests(int parallel)
354354
printf("============================================\n");
355355
printf(" S U C C E S S\n");
356356
printf("============================================\n");
357-
printf("%d/%ld tests done, %d filtered, %d iterations each, parallelism of %d at a time \n",
357+
printf("%d/%zu tests done, %d filtered, %d iterations each, parallelism of %d at a time \n",
358358
n_include_tests, TOTAL_TESTS, n_exclude_tests, iterations,
359359
nthreads);
360360
if (!run_cuda_tests)
361-
printf("skipped %lu cuda tests\n", NUM_CUDA_TESTS);
361+
printf("skipped %zu cuda tests\n", NUM_CUDA_TESTS);
362362
if (!run_rocm_tests)
363-
printf("skipped %lu rocm tests\n", NUM_ROCM_TESTS);
363+
printf("skipped %zu rocm tests\n", NUM_ROCM_TESTS);
364364
}
365365

366366
void usage()

0 commit comments

Comments
 (0)